Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git] / drivers / staging / meilhaus / me6000_ao.c
index 3f5ff6d..66652dc 100644 (file)
@@ -36,8 +36,8 @@
 
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 /* Defines
  */
 
-static int me6000_ao_query_range_by_min_max(me_subdevice_t * subdevice,
+static int me6000_ao_query_range_by_min_max(me_subdevice_t *subdevice,
                                            int unit,
                                            int *min,
                                            int *max, int *maxdata, int *range);
 
-static int me6000_ao_query_number_ranges(me_subdevice_t * subdevice,
+static int me6000_ao_query_number_ranges(me_subdevice_t *subdevice,
                                         int unit, int *count);
 
-static int me6000_ao_query_range_info(me_subdevice_t * subdevice,
+static int me6000_ao_query_range_info(me_subdevice_t *subdevice,
                                      int range,
                                      int *unit,
                                      int *min, int *max, int *maxdata);
 
-static int me6000_ao_query_timer(me_subdevice_t * subdevice,
+static int me6000_ao_query_timer(me_subdevice_t *subdevice,
                                 int timer,
                                 int *base_frequency,
                                 long long *min_ticks, long long *max_ticks);
 
-static int me6000_ao_query_number_channels(me_subdevice_t * subdevice,
+static int me6000_ao_query_number_channels(me_subdevice_t *subdevice,
                                           int *number);
 
-static int me6000_ao_query_subdevice_type(me_subdevice_t * subdevice,
+static int me6000_ao_query_subdevice_type(me_subdevice_t *subdevice,
                                          int *type, int *subtype);
 
-static int me6000_ao_query_subdevice_caps(me_subdevice_t * subdevice,
+static int me6000_ao_query_subdevice_caps(me_subdevice_t *subdevice,
                                          int *caps);
 
 static int me6000_ao_query_subdevice_caps_args(struct me_subdevice *subdevice,
@@ -91,11 +91,11 @@ static int me6000_ao_query_subdevice_caps_args(struct me_subdevice *subdevice,
 static void me6000_ao_destructor(struct me_subdevice *subdevice);
 
 /** Reset subdevice. Stop all actions. Reset registry. Disable FIFO. Set output to 0V and status to 'none'. */
-static int me6000_ao_io_reset_subdevice(me_subdevice_t * subdevice,
+static int me6000_ao_io_reset_subdevice(me_subdevice_t *subdevice,
                                        struct file *filep, int flags);
 
 /** Set output as single */
-static int me6000_ao_io_single_config(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_config(me_subdevice_t *subdevice,
                                      struct file *filep,
                                      int channel,
                                      int single_config,
@@ -104,89 +104,81 @@ static int me6000_ao_io_single_config(me_subdevice_t * subdevice,
                                      int trig_type, int trig_edge, int flags);
 
 /** Pass to user actual value of output. */
-static int me6000_ao_io_single_read(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_read(me_subdevice_t *subdevice,
                                    struct file *filep,
                                    int channel,
                                    int *value, int time_out, int flags);
 
 /** Write to output requed value. */
-static int me6000_ao_io_single_write(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_write(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int channel,
                                     int value, int time_out, int flags);
 
 /** Set output as streamed device. */
-static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_config(me_subdevice_t *subdevice,
                                      struct file *filep,
-                                     meIOStreamConfig_t * config_list,
+                                     meIOStreamConfig_t *config_list,
                                      int count,
-                                     meIOStreamTrigger_t * trigger,
+                                     meIOStreamTrigger_t *trigger,
                                      int fifo_irq_threshold, int flags);
 
 /** Wait for / Check empty space in buffer. */
-static int me6000_ao_io_stream_new_values(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_new_values(me_subdevice_t *subdevice,
                                          struct file *filep,
                                          int time_out, int *count, int flags);
 
 /** Start streaming. */
-static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_start(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int start_mode, int time_out, int flags);
 
 /** Check actual state. / Wait for end. */
-static int me6000_ao_io_stream_status(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_status(me_subdevice_t *subdevice,
                                      struct file *filep,
                                      int wait,
                                      int *status, int *values, int flags);
 
 /** Stop streaming. */
-static int me6000_ao_io_stream_stop(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_stop(me_subdevice_t *subdevice,
                                    struct file *filep,
                                    int stop_mode, int flags);
 
 /** Write datas to buffor. */
-static int me6000_ao_io_stream_write(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_write(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int write_mode,
                                     int *values, int *count, int flags);
 
 /** Interrupt handler. Copy from buffer to FIFO. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
 static irqreturn_t me6000_ao_isr(int irq, void *dev_id);
-#else
-static irqreturn_t me6000_ao_isr(int irq, void *dev_id, struct pt_regs *regs);
-#endif
 
 /** Copy data from circular buffer to fifo (fast) in wraparound mode. */
-int inline ao_write_data_wraparound(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data_wraparound(me6000_ao_subdevice_t *instance, int count,
                                    int start_pos);
 
 /** Copy data from circular buffer to fifo (fast).*/
-int inline ao_write_data(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data(me6000_ao_subdevice_t *instance, int count,
                         int start_pos);
 
 /** Copy data from circular buffer to fifo (slow).*/
-int inline ao_write_data_pooling(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data_pooling(me6000_ao_subdevice_t *instance, int count,
                                 int start_pos);
 
 /** Copy data from user space to circular buffer. */
-int inline ao_get_data_from_user(me6000_ao_subdevice_t * instance, int count,
+inline int ao_get_data_from_user(me6000_ao_subdevice_t *instance, int count,
                                 int *user_values);
 
 /** Stop presentation. Preserve FIFOs. */
-int inline ao_stop_immediately(me6000_ao_subdevice_t * instance);
+inline int ao_stop_immediately(me6000_ao_subdevice_t *instance);
 
 /** Function for checking timeout in non-blocking mode. */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void me6000_ao_work_control_task(void *subdevice);
-#else
 static void me6000_ao_work_control_task(struct work_struct *work);
-#endif
 
 /* Functions
  */
 
-static int me6000_ao_io_reset_subdevice(me_subdevice_t * subdevice,
+static int me6000_ao_io_reset_subdevice(me_subdevice_t *subdevice,
                                        struct file *filep, int flags)
 {
        me6000_ao_subdevice_t *instance;
@@ -274,7 +266,7 @@ static int me6000_ao_io_reset_subdevice(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_single_config(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_config(me_subdevice_t *subdevice,
                                      struct file *filep,
                                      int channel,
                                      int single_config,
@@ -473,7 +465,7 @@ static int me6000_ao_io_single_config(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_single_read(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_read(me_subdevice_t *subdevice,
                                    struct file *filep,
                                    int channel,
                                    int *value, int time_out, int flags)
@@ -555,7 +547,7 @@ static int me6000_ao_io_single_read(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_single_write(me_subdevice_t * subdevice,
+static int me6000_ao_io_single_write(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int channel,
                                     int value, int time_out, int flags)
@@ -863,7 +855,7 @@ static int me6000_ao_io_single_write(me_subdevice_t * subdevice,
 
 /// @note When flag 'ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS' is set than output is triggered. ALWAYS!
 
-       PINFO("<%s> start mode= 0x%08x %s\n", __FUNCTION__, mode,
+       PINFO("<%s> start mode= 0x%08x %s\n", __func__, mode,
              (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" :
              "");
        if (instance->fifo & ME6000_AO_HAS_FIFO) {      // FIFO - Continous mode
@@ -1027,11 +1019,11 @@ static int me6000_ao_io_single_write(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_config(me_subdevice_t *subdevice,
                                      struct file *filep,
-                                     meIOStreamConfig_t * config_list,
+                                     meIOStreamConfig_t *config_list,
                                      int count,
-                                     meIOStreamTrigger_t * trigger,
+                                     meIOStreamTrigger_t *trigger,
                                      int fifo_irq_threshold, int flags)
 {
        me6000_ao_subdevice_t *instance;
@@ -1063,7 +1055,7 @@ static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
        }
 
        if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
-               if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
+               if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
                        PERROR
                            ("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
                        return ME_ERRNO_INVALID_FLAGS;
@@ -1359,7 +1351,7 @@ static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_new_values(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_new_values(me_subdevice_t *subdevice,
                                          struct file *filep,
                                          int time_out, int *count, int flags)
 {
@@ -1440,7 +1432,7 @@ static int me6000_ao_io_stream_new_values(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_start(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int start_mode, int time_out, int flags)
 {
@@ -1663,7 +1655,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
 
        status = inl(instance->status_reg);
        //Start state machine and interrupts
-       PINFO("<%s:%d> Start state machine.\n", __FUNCTION__, __LINE__);
+       PINFO("<%s:%d> Start state machine.\n", __func__, __LINE__);
        ctrl &= ~(ME6000_AO_CTRL_BIT_STOP | ME6000_AO_CTRL_BIT_IMMEDIATE_STOP);
        if (instance->start_mode == ME6000_AO_EXT_TRIG) {
                PDEBUG("DIGITAL TRIGGER\n");
@@ -1671,7 +1663,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
        }
        if (!(status & ME6000_AO_STATUS_BIT_HF)) {      //More than half!
                if ((ctrl & ME6000_AO_CTRL_MODE_MASK) == ME6000_AO_MODE_CONTINUOUS) {   //Enable IRQ only when hardware_continous is set and FIFO is more than half
-                       PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__,
+                       PINFO("<%s:%d> Start interrupts.\n", __func__,
                              __LINE__);
                        ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
                }
@@ -1682,7 +1674,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
        spin_unlock_irqrestore(&instance->subdevice_lock, cpu_flags);
 
        //Trigger output
-       PINFO("<%s> start mode= 0x%x %s\n", __FUNCTION__, instance->start_mode,
+       PINFO("<%s> start mode= 0x%x %s\n", __func__, instance->start_mode,
              (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" :
              "");
        if (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) {       //Trigger outputs
@@ -1777,7 +1769,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
                status = inl(instance->status_reg);
                if (!(status & ME6000_AO_STATUS_BIT_HF)) {      //More than half!
                        spin_lock_irqsave(&instance->subdevice_lock, cpu_flags);
-                       PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__,
+                       PINFO("<%s:%d> Start interrupts.\n", __func__,
                              __LINE__);
                        ctrl = inl(instance->ctrl_reg);
                        ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
@@ -1819,7 +1811,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
                                spin_lock_irqsave(&instance->subdevice_lock,
                                                  cpu_flags);
                                PINFO("<%s:%d> Start interrupts.\n",
-                                     __FUNCTION__, __LINE__);
+                                     __func__, __LINE__);
                                ctrl = inl(instance->ctrl_reg);
                                ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
                                outl(ctrl, instance->ctrl_reg);
@@ -1889,7 +1881,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_status(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_status(me_subdevice_t *subdevice,
                                      struct file *filep,
                                      int wait,
                                      int *status, int *values, int flags)
@@ -1987,7 +1979,7 @@ static int me6000_ao_io_stream_status(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_stop(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_stop(me_subdevice_t *subdevice,
                                    struct file *filep,
                                    int stop_mode, int flags)
 {                              /// @note Stop work and empty buffer and FIFO
@@ -2094,7 +2086,7 @@ static int me6000_ao_io_stream_stop(me_subdevice_t * subdevice,
        return err;
 }
 
-static int me6000_ao_io_stream_write(me_subdevice_t * subdevice,
+static int me6000_ao_io_stream_write(me_subdevice_t *subdevice,
                                     struct file *filep,
                                     int write_mode,
                                     int *values, int *count, int flags)
@@ -2324,11 +2316,7 @@ static int me6000_ao_io_stream_write(me_subdevice_t * subdevice,
        return err;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
 static irqreturn_t me6000_ao_isr(int irq, void *dev_id)
-#else
-static irqreturn_t me6000_ao_isr(int irq, void *dev_id, struct pt_regs *regs)
-#endif
 {
        me6000_ao_subdevice_t *instance = dev_id;
        uint32_t irq_status;
@@ -2346,7 +2334,7 @@ static irqreturn_t me6000_ao_isr(int irq, void *dev_id, struct pt_regs *regs)
        irq_status = inl(instance->irq_status_reg);
        if (!(irq_status & (ME6000_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) {
                PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n",
-                     jiffies, __FUNCTION__, instance->ao_idx, irq_status);
+                     jiffies, __func__, instance->ao_idx, irq_status);
                return IRQ_NONE;
        }
 
@@ -2544,9 +2532,9 @@ static void me6000_ao_destructor(struct me_subdevice *subdevice)
 }
 
 me6000_ao_subdevice_t *me6000_ao_constructor(uint32_t reg_base,
-                                            spinlock_t * preload_reg_lock,
-                                            uint32_t * preload_flags,
-                                            uint32_t * triggering_flags,
+                                            spinlock_t *preload_reg_lock,
+                                            uint32_t *preload_flags,
+                                            uint32_t *triggering_flags,
                                             int ao_idx,
                                             int fifo,
                                             int irq,
@@ -2639,11 +2627,7 @@ me6000_ao_subdevice_t *me6000_ao_constructor(uint32_t reg_base,
        if (subdevice->fifo & ME6000_AO_HAS_FIFO) {
                subdevice->irq = irq;
                if (request_irq(subdevice->irq, me6000_ao_isr,
-#ifdef IRQF_DISABLED
                                IRQF_DISABLED | IRQF_SHARED,
-#else
-                               SA_INTERRUPT | SA_SHIRQ,
-#endif
                                ME6000_NAME, subdevice)) {
                        PERROR("Cannot get interrupt line.\n");
                        PDEBUG("free circ_buf = %p size=%d",
@@ -2797,13 +2781,8 @@ me6000_ao_subdevice_t *me6000_ao_constructor(uint32_t reg_base,
        subdevice->me6000_workqueue = me6000_wq;
 
 /* workqueue API changed in kernel 2.6.20 */
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) )
-       INIT_WORK(&subdevice->ao_control_task, me6000_ao_work_control_task,
-                 (void *)subdevice);
-#else
        INIT_DELAYED_WORK(&subdevice->ao_control_task,
                          me6000_ao_work_control_task);
-#endif
 
        if (subdevice->fifo) {  //Set speed
                outl(ME6000_AO_MIN_CHAN_TICKS - 1, subdevice->timer_reg);
@@ -2817,7 +2796,7 @@ me6000_ao_subdevice_t *me6000_ao_constructor(uint32_t reg_base,
 *
 * @param instance The subdevice instance (pointer).
 */
-int inline ao_stop_immediately(me6000_ao_subdevice_t * instance)
+inline int ao_stop_immediately(me6000_ao_subdevice_t *instance)
 {
        unsigned long cpu_flags;
        uint32_t ctrl;
@@ -2825,10 +2804,11 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance)
        int i;
        uint32_t single_mask;
 
-       single_mask =
-           (instance->ao_idx - ME6000_AO_SINGLE_STATUS_OFFSET <
-            0) ? 0x0000 : (0x0001 << (instance->ao_idx -
-                                      ME6000_AO_SINGLE_STATUS_OFFSET));
+       if (instance->ao_idx < ME6000_AO_SINGLE_STATUS_OFFSET)
+               single_mask = 0x0000;
+       else
+               single_mask = 0x0001 << (instance->ao_idx -
+                               ME6000_AO_SINGLE_STATUS_OFFSET);
 
        timeout =
            (instance->hardware_stop_delay >
@@ -2861,7 +2841,7 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance)
                        }
                }
 
-               PINFO("<%s> Wait for stop: %d\n", __FUNCTION__, i);
+               PINFO("<%s> Wait for stop: %d\n", __func__, i);
 
                //Still working!
                set_current_state(TASK_INTERRUPTIBLE);
@@ -2887,7 +2867,7 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance)
 * @return On error/success: 0. No datas were copied => no data in buffer.
 * @return On error: -ME_ERRNO_FIFO_BUFFER_OVERFLOW.
 */
-int inline ao_write_data_wraparound(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data_wraparound(me6000_ao_subdevice_t *instance, int count,
                                    int start_pos)
 {                              /// @note This is time critical function!
        uint32_t status;
@@ -2952,7 +2932,7 @@ int inline ao_write_data_wraparound(me6000_ao_subdevice_t * instance, int count,
 * @return On error/success: 0. No datas were copied => no data in buffer.
 * @return On error: -ME_ERRNO_FIFO_BUFFER_OVERFLOW.
 */
-int inline ao_write_data(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data(me6000_ao_subdevice_t *instance, int count,
                         int start_pos)
 {                              /// @note This is time critical function!
        uint32_t status;
@@ -3022,7 +3002,7 @@ int inline ao_write_data(me6000_ao_subdevice_t * instance, int count,
 * @return On error/success: 0. FIFO was full at begining.
 * @return On error: -ME_ERRNO_RING_BUFFER_UNDEFFLOW.
 */
-int inline ao_write_data_pooling(me6000_ao_subdevice_t * instance, int count,
+inline int ao_write_data_pooling(me6000_ao_subdevice_t *instance, int count,
                                 int start_pos)
 {                              /// @note This is slow function!
        uint32_t status;
@@ -3080,7 +3060,7 @@ int inline ao_write_data_pooling(me6000_ao_subdevice_t * instance, int count,
 * @return On success: Number of copied values.
 * @return On error: -ME_ERRNO_INTERNAL.
 */
-int inline ao_get_data_from_user(me6000_ao_subdevice_t * instance, int count,
+inline int ao_get_data_from_user(me6000_ao_subdevice_t *instance, int count,
                                 int *user_values)
 {
        int i, err;
@@ -3109,13 +3089,7 @@ int inline ao_get_data_from_user(me6000_ao_subdevice_t * instance, int count,
        return copied;
 }
 
-static void me6000_ao_work_control_task(
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-                                              void *subdevice
-#else
-                                              struct work_struct *work
-#endif
-    )
+static void me6000_ao_work_control_task(struct work_struct *work)
 {
        me6000_ao_subdevice_t *instance;
        unsigned long cpu_flags = 0;
@@ -3126,13 +3100,9 @@ static void me6000_ao_work_control_task(
        int signaling = 0;
        uint32_t single_mask;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-       instance = (me6000_ao_subdevice_t *) subdevice;
-#else
        instance =
            container_of((void *)work, me6000_ao_subdevice_t, ao_control_task);
-#endif
-       PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies,
+       PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies,
              instance->ao_idx);
 
        status = inl(instance->status_reg);
@@ -3550,12 +3520,12 @@ static void me6000_ao_work_control_task(
                queue_delayed_work(instance->me6000_workqueue,
                                   &instance->ao_control_task, 1);
        } else {
-               PINFO("<%s> Ending control task.\n", __FUNCTION__);
+               PINFO("<%s> Ending control task.\n", __func__);
        }
 
 }
 
-static int me6000_ao_query_range_by_min_max(me_subdevice_t * subdevice,
+static int me6000_ao_query_range_by_min_max(me_subdevice_t *subdevice,
                                            int unit,
                                            int *min,
                                            int *max, int *maxdata, int *range)
@@ -3589,7 +3559,7 @@ static int me6000_ao_query_range_by_min_max(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_number_ranges(me_subdevice_t * subdevice,
+static int me6000_ao_query_number_ranges(me_subdevice_t *subdevice,
                                         int unit, int *count)
 {
        me6000_ao_subdevice_t *instance;
@@ -3607,7 +3577,7 @@ static int me6000_ao_query_number_ranges(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_range_info(me_subdevice_t * subdevice,
+static int me6000_ao_query_range_info(me_subdevice_t *subdevice,
                                      int range,
                                      int *unit,
                                      int *min, int *max, int *maxdata)
@@ -3631,7 +3601,7 @@ static int me6000_ao_query_range_info(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_timer(me_subdevice_t * subdevice,
+static int me6000_ao_query_timer(me_subdevice_t *subdevice,
                                 int timer,
                                 int *base_frequency,
                                 long long *min_ticks, long long *max_ticks)
@@ -3660,7 +3630,7 @@ static int me6000_ao_query_timer(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_number_channels(me_subdevice_t * subdevice,
+static int me6000_ao_query_number_channels(me_subdevice_t *subdevice,
                                           int *number)
 {
        me6000_ao_subdevice_t *instance;
@@ -3672,7 +3642,7 @@ static int me6000_ao_query_number_channels(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_subdevice_type(me_subdevice_t * subdevice,
+static int me6000_ao_query_subdevice_type(me_subdevice_t *subdevice,
                                          int *type, int *subtype)
 {
        me6000_ao_subdevice_t *instance;
@@ -3690,7 +3660,7 @@ static int me6000_ao_query_subdevice_type(me_subdevice_t * subdevice,
        return ME_ERRNO_SUCCESS;
 }
 
-static int me6000_ao_query_subdevice_caps(me_subdevice_t * subdevice, int *caps)
+static int me6000_ao_query_subdevice_caps(me_subdevice_t *subdevice, int *caps)
 {
        me6000_ao_subdevice_t *instance;
        instance = (me6000_ao_subdevice_t *) subdevice;