[PATCH V1 2/2] Staging: comedi: fix printk issue in cb_pcidas.c

From: Ravishankar Karkala Mallikarjunayya
Date: Mon Oct 03 2011 - 10:11:54 EST


This is a patch to the cb_pcidas.c file that fixes up a printk warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@xxxxxxxxxxxxxxx>
---
Space issue is fixed. Sorry by mistake Earlier i sent wrong one.
please find the correct one.

drivers/staging/comedi/drivers/cb_pcidas.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 9dec153..1fc8db4 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -565,7 +565,8 @@ static int cb_pcidas_attach(struct comedi_device *dev,
int index;
int i;

- pr_info("comedi%d: cb_pcidas: ", dev->minor);
+ dev_info(&pcidev->dev, "comedi%d: cb_pcidas:\n",
+ dev->minor);

/*
* Allocate the private structure area.
@@ -576,7 +577,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
/*
* Probe the device to determine what device in the series it is.
*/
- printk("\n");

for_each_pci_dev(pcidev) {
/* is it not a computer boards card? */
@@ -600,20 +600,24 @@ static int cb_pcidas_attach(struct comedi_device *dev,
}
}

- printk("No supported ComputerBoards/MeasurementComputing card found on "
- "requested position\n");
+ dev_err(&pcidev->dev, "No supported "
+ "ComputerBoards/MeasurementComputing "
+ "card found on requested position\n");
return -EIO;

found:

- printk("Found %s on bus %i, slot %i\n", cb_pcidas_boards[index].name,
- pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+ dev_info(&pcidev->dev, "Found %s on bus %i, slot %i\n",
+ cb_pcidas_boards[index].name,
+ pcidev->bus->number,
+ PCI_SLOT(pcidev->devfn));

/*
* Enable PCI device and reserve I/O ports.
*/
if (comedi_pci_enable(pcidev, "cb_pcidas")) {
- printk(" Failed to enable PCI device and request regions\n");
+ dev_err(&pcidev->dev, "Failed to enable PCI "
+ "device and request regions\n");
return -EIO;
}
/*
@@ -639,7 +643,8 @@ found:
/* get irq */
if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt,
IRQF_SHARED, "cb_pcidas", dev)) {
- printk(" unable to allocate irq %d\n", devpriv->pci_dev->irq);
+ dev_warn(&pcidev->dev, "unable to allocate irq %d\n",
+ devpriv->pci_dev->irq);
return -EINVAL;
}
dev->irq = devpriv->pci_dev->irq;
@@ -768,7 +773,8 @@ found:
*/
static int cb_pcidas_detach(struct comedi_device *dev)
{
- pr_info("comedi%d: cb_pcidas: remove\n", dev->minor);
+ pr_info(&pcidev->dev, "comedi%d: cb_pcidas: remove\n",
+ dev->minor);

if (devpriv) {
if (devpriv->s5933_config) {
--
1.7.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/