renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
Code

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

Browse Source 
fixed below checkpatch warnings.
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
YAMANE Toshiaki 2012-10-08 21:26:33 +09:00 committed by Greg Kroah-Hartman
parent 66ae18fa13
commit e209939f31
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/ii_pci20kc.c
View File

@ -216,13 +216,13 @@ static int pci20xxx_attach(struct comedi_device *dev,
/* Check PCI-20001 C-2A Carrier Board ID */
if ((readb(devpriv->ioaddr) & PCI20000_ID) != PCI20000_ID) {
printk(KERN_WARNING "comedi%d: ii_pci20kc PCI-20001"
" C-2A Carrier Board at base=0x%p not found !\n",
dev->minor, devpriv->ioaddr);
dev_warn(dev->class_dev,
"PCI-20001 C-2A Carrier Board at base=0x%p not found !\n",
devpriv->ioaddr);
return -EINVAL;
}
printk(KERN_INFO "comedi%d: ii_pci20kc: PCI-20001 C-2A at base=0x%p\n",
dev->minor, devpriv->ioaddr);
dev_info(dev->class_dev, "PCI-20001 C-2A at base=0x%p\n",
devpriv->ioaddr);
for (i = 0; i < PCI20000_MODULES; i++) {
s = &dev->subdevices[i];
@ -235,23 +235,21 @@ static int pci20xxx_attach(struct comedi_device *dev,
devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
pci20006_init(dev, s, it->options[2 * i + 2],
it->options[2 * i + 3]);
printk(KERN_INFO "comedi%d: "
"ii_pci20kc PCI-20006 module in slot %d\n",
dev->minor, i + 1);
dev_info(dev->class_dev,
"PCI-20006 module in slot %d\n", i + 1);
break;
case PCI20341_ID:
sdp->pci20341.iobase =
devpriv->ioaddr + (i + 1) * PCI20000_OFFSET;
pci20341_init(dev, s, it->options[2 * i + 2],
it->options[2 * i + 3]);
printk(KERN_INFO "comedi%d: "
"ii_pci20kc PCI-20341 module in slot %d\n",
dev->minor, i + 1);
dev_info(dev->class_dev,
"PCI-20341 module in slot %d\n", i + 1);
break;
default:
printk(KERN_WARNING "ii_pci20kc: unknown module "
"code 0x%02x in slot %d: module disabled\n",
id, i); /* XXX this looks like a bug! i + 1 ?? */
dev_warn(dev->class_dev,
"unknown module code 0x%02x in slot %d: module disabled\n",
id, i); /* XXX this looks like a bug! i + 1 ?? */
/* fall through */
case PCI20xxx_EMPTY_ID:
s->type = COMEDI_SUBD_UNUSED;
@ -347,8 +345,7 @@ static int pci20006_insn_write(struct comedi_device *dev,
writeb(0x00, sdp->iobase + PCI20006_STROBE1);
break;
default:
printk(KERN_WARNING
" comedi%d: pci20xxx: ao channel Error!\n", dev->minor);
dev_warn(dev->class_dev, "ao channel Error!\n");
return -EINVAL;
}
@ -463,10 +460,8 @@ static int pci20341_insn_read(struct comedi_device *dev,
eoc = readb(sdp->iobase + PCI20341_STATUS_REG);
}
if (j >= 100) {
printk(KERN_WARNING
"comedi%d: pci20xxx: "
"AI interrupt channel %i polling exit !\n",
dev->minor, i);
dev_warn(dev->class_dev,
"AI interrupt channel %i polling exit !\n", i);
return -EINVAL;
}
lo = readb(sdp->iobase + PCI20341_LDATA);