Commit ce3ed9f0 authored by YAMANE Toshiaki's avatar YAMANE Toshiaki Committed by Greg Kroah-Hartman

staging/comedi: Use dev_ printks in drivers/quatech_daqp_cs.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...
- 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 ...

and added pr_fmt.
Signed-off-by: default avatarYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89a3f111
...@@ -47,6 +47,8 @@ Status: works ...@@ -47,6 +47,8 @@ Status: works
Devices: [Quatech] DAQP-208 (daqp), DAQP-308 Devices: [Quatech] DAQP-208 (daqp), DAQP-308
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../comedidev.h" #include "../comedidev.h"
#include <linux/semaphore.h> #include <linux/semaphore.h>
...@@ -195,8 +197,8 @@ static struct comedi_driver driver_daqp = { ...@@ -195,8 +197,8 @@ static struct comedi_driver driver_daqp = {
static void daqp_dump(struct comedi_device *dev) static void daqp_dump(struct comedi_device *dev)
{ {
printk(KERN_INFO "DAQP: status %02x; aux status %02x\n", dev_info(dev->class_dev, "status %02x; aux status %02x\n",
inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX)); inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
} }
static void hex_dump(char *str, void *ptr, int len) static void hex_dump(char *str, void *ptr, int len)
...@@ -255,33 +257,29 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) ...@@ -255,33 +257,29 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
int status; int status;
if (local == NULL) { if (local == NULL) {
printk(KERN_WARNING pr_warn("irq %d for unknown device.\n", irq);
"daqp_interrupt(): irq %d for unknown device.\n", irq);
return IRQ_NONE; return IRQ_NONE;
} }
dev = local->dev; dev = local->dev;
if (dev == NULL) { if (dev == NULL) {
printk(KERN_WARNING "daqp_interrupt(): NULL comedi_device.\n"); pr_warn("NULL comedi_device.\n");
return IRQ_NONE; return IRQ_NONE;
} }
if (!dev->attached) { if (!dev->attached) {
printk(KERN_WARNING pr_warn("struct comedi_device not yet attached.\n");
"daqp_interrupt(): struct comedi_device not yet attached.\n");
return IRQ_NONE; return IRQ_NONE;
} }
s = local->s; s = local->s;
if (s == NULL) { if (s == NULL) {
printk(KERN_WARNING pr_warn("NULL comedi_subdevice.\n");
"daqp_interrupt(): NULL comedi_subdevice.\n");
return IRQ_NONE; return IRQ_NONE;
} }
if ((struct local_info_t *)s->private != local) { if ((struct local_info_t *)s->private != local) {
printk(KERN_WARNING pr_warn("invalid comedi_subdevice.\n");
"daqp_interrupt(): invalid comedi_subdevice.\n");
return IRQ_NONE; return IRQ_NONE;
} }
...@@ -331,8 +329,8 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) ...@@ -331,8 +329,8 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
} }
if (loop_limit <= 0) { if (loop_limit <= 0) {
printk(KERN_WARNING dev_warn(dev->class_dev,
"loop_limit reached in daqp_interrupt()\n"); "loop_limit reached in daqp_interrupt()\n");
daqp_ai_cancel(dev, s); daqp_ai_cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
} }
...@@ -736,8 +734,8 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -736,8 +734,8 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
while (--counter while (--counter
&& (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ; && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ;
if (!counter) { if (!counter) {
printk(KERN_ERR dev_err(dev->class_dev,
"daqp: couldn't clear interrupts in status register\n"); "couldn't clear interrupts in status register\n");
return -1; return -1;
} }
...@@ -852,8 +850,8 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -852,8 +850,8 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret) if (ret)
return ret; return ret;
printk(KERN_INFO "comedi%d: attaching daqp%d (io 0x%04lx)\n", dev_info(dev->class_dev, "attaching daqp%d (io 0x%04lx)\n",
dev->minor, it->options[0], dev->iobase); it->options[0], dev->iobase);
s = &dev->subdevices[0]; s = &dev->subdevices[0];
dev->read_subdev = s; dev->read_subdev = s;
...@@ -958,7 +956,7 @@ static int daqp_cs_attach(struct pcmcia_device *link) ...@@ -958,7 +956,7 @@ static int daqp_cs_attach(struct pcmcia_device *link)
if (dev_table[i] == NULL) if (dev_table[i] == NULL)
break; break;
if (i == MAX_DEV) { if (i == MAX_DEV) {
printk(KERN_NOTICE "daqp_cs: no devices available\n"); dev_notice(&link->dev, "no devices available\n");
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment