Skip to content

Commit

Permalink
staging/comedi: Use pr_ or dev_ printks in drivers/gsc_hpdi.c
Browse files Browse the repository at this point in the history
fixed below checkpatch warning.
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...

some of them have been replaced by dev_dbg.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Oct 26, 2012
1 parent ea50aab commit 37a836b
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int i;
int retval;

printk(KERN_WARNING "comedi%d: gsc_hpdi\n", dev->minor);
dev_dbg(dev->class_dev, "gsc_hpdi\n");

devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
Expand Down Expand Up @@ -510,17 +510,17 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} while (pcidev != NULL);
}
if (dev->board_ptr == NULL) {
printk(KERN_WARNING "gsc_hpdi: no hpdi card found\n");
dev_warn(dev->class_dev, "no hpdi card found\n");
return -EIO;
}

printk(KERN_WARNING
"gsc_hpdi: found %s on bus %i, slot %i\n", board(dev)->name,
pcidev->bus->number, PCI_SLOT(pcidev->devfn));
dev_warn(dev->class_dev,
"found %s on bus %i, slot %i\n", board(dev)->name,
pcidev->bus->number, PCI_SLOT(pcidev->devfn));

if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
printk(KERN_WARNING
" failed enable PCI device and request regions\n");
dev_warn(dev->class_dev,
"failed enable PCI device and request regions\n");
return -EIO;
}
pci_set_master(pcidev);
Expand All @@ -541,7 +541,7 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ioremap(devpriv->hpdi_phys_iobase,
pci_resource_len(pcidev, HPDI_BADDRINDEX));
if (!devpriv->plx9080_iobase || !devpriv->hpdi_iobase) {
printk(KERN_WARNING " failed to remap io memory\n");
dev_warn(dev->class_dev, "failed to remap io memory\n");
return -ENOMEM;
}

Expand All @@ -553,13 +553,13 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* get irq */
if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
dev->driver->driver_name, dev)) {
printk(KERN_WARNING
" unable to allocate irq %u\n", pcidev->irq);
dev_warn(dev->class_dev,
"unable to allocate irq %u\n", pcidev->irq);
return -EINVAL;
}
dev->irq = pcidev->irq;

printk(KERN_WARNING " irq %u\n", dev->irq);
dev_dbg(dev->class_dev, " irq %u\n", dev->irq);

/* allocate pci dma buffers */
for (i = 0; i < NUM_DMA_BUFFERS; i++) {
Expand All @@ -577,8 +577,8 @@ static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it)
&devpriv->
dma_desc_phys_addr);
if (devpriv->dma_desc_phys_addr & 0xf) {
printk(KERN_WARNING
" dma descriptors not quad-word aligned (bug)\n");
dev_warn(dev->class_dev,
" dma descriptors not quad-word aligned (bug)\n");
return -EIO;
}

Expand Down

0 comments on commit 37a836b

Please sign in to comment.