staging/comedi: Use dev_ printks in ni_tiocmd.c
authorYAMANE Toshiaki <yamanetoshi@gmail.com>
Fri, 2 Nov 2012 04:55:48 +0000 (13:55 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Nov 2012 18:36:03 +0000 (11:36 -0700)
fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
- WARNING: Prefer netdev_notice(netdev, ... then dev_notice(dev, ... then pr_notice(...  to printk(KERN_NOTICE ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_tiocmd.c

index 8ee93d3..11a377a 100644 (file)
@@ -173,7 +173,8 @@ static int ni_tio_input_cmd(struct ni_gpct *counter, struct comedi_async *async)
 static int ni_tio_output_cmd(struct ni_gpct *counter,
                             struct comedi_async *async)
 {
-       printk(KERN_ERR "ni_tio: output commands not yet implemented.\n");
+       dev_err(counter->counter_dev->dev->class_dev,
+               "output commands not yet implemented.\n");
        return -ENOTSUPP;
 
        counter->mite_chan->dir = COMEDI_OUTPUT;
@@ -219,7 +220,10 @@ int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)
 
        spin_lock_irqsave(&counter->lock, flags);
        if (counter->mite_chan == NULL) {
-               printk(KERN_ERR "ni_tio: commands only supported with DMA.  Interrupt-driven commands not yet implemented.\n");
+               dev_err(counter->counter_dev->dev->class_dev,
+                       "commands only supported with DMA.  ");
+               dev_err(counter->counter_dev->dev->class_dev,
+                       "Interrupt-driven commands not yet implemented.\n");
                retval = -EIO;
        } else {
                retval = ni_tio_cmd_setup(counter, async);
@@ -427,8 +431,9 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
                                  NITIO_Gxx_Joint_Status2_Reg
                                  (counter->counter_index)) &
                    Gi_Permanent_Stale_Bit(counter->counter_index)) {
-                       printk(KERN_INFO "%s: Gi_Permanent_Stale_Data detected.\n",
-                              __func__);
+                       dev_info(counter->counter_dev->dev->class_dev,
+                                "%s: Gi_Permanent_Stale_Data detected.\n",
+                                __func__);
                        if (perm_stale_data)
                                *perm_stale_data = 1;
                }
@@ -448,7 +453,8 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
        ni_tio_acknowledge_and_confirm(counter, &gate_error, &tc_error,
                                       &perm_stale_data, NULL);
        if (gate_error) {
-               printk(KERN_NOTICE "%s: Gi_Gate_Error detected.\n", __func__);
+               dev_notice(counter->counter_dev->dev->class_dev,
+                          "%s: Gi_Gate_Error detected.\n", __func__);
                s->async->events |= COMEDI_CB_OVERFLOW;
        }
        if (perm_stale_data)
@@ -459,8 +465,8 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
                if (read_register(counter,
                                NITIO_Gi_DMA_Status_Reg
                                (counter->counter_index)) & Gi_DRQ_Error_Bit) {
-                       printk(KERN_NOTICE "%s: Gi_DRQ_Error detected.\n",
-                                                       __func__);
+                       dev_notice(counter->counter_dev->dev->class_dev,
+                                  "%s: Gi_DRQ_Error detected.\n", __func__);
                        s->async->events |= COMEDI_CB_OVERFLOW;
                }
                break;