[PATCH 5/9] Staging: comedi: fix printk issue in cb_pcimdas.c

From: Ravishankar Karkala Mallikarjunayya
Date: Fri Sep 30 2011 - 09:19:32 EST


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

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@xxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index b1b832b..20e1421 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -212,7 +212,8 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
int index;
/* int i; */

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

/*
* Allocate the private structure area.
@@ -223,7 +224,6 @@ static int cb_pcimdas_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? */
@@ -248,14 +248,17 @@ static int cb_pcimdas_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_pcimdas_boards[index].name,
- pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+ dev_info(&pcidev->dev, "Found %s on bus %i, slot %i\n",
+ cb_pcimdas_boards[index].name,
+ pcidev->bus->number,
+ PCI_SLOT(pcidev->devfn));

/* Warn about non-tested features */
switch (thisboard->device_id) {
@@ -267,7 +270,8 @@ found:
}

if (comedi_pci_enable(pcidev, "cb_pcimdas")) {
- printk(" Failed to enable PCI device and request regions\n");
+ dev_warn(&pcidev->dev, "Failed to enable PCI"
+ " device and request regions\n");
return -EIO;
}

@@ -333,7 +337,7 @@ found:
else
s->type = COMEDI_SUBD_UNUSED;

- printk("attached\n");
+ dev_info(&pcidev->dev, "attached\n");

return 1;
}
@@ -357,7 +361,7 @@ static int cb_pcimdas_detach(struct comedi_device *dev)
printk("devpriv->BADR4 = 0x%lx\n", devpriv->BADR4);
}
#endif
- printk("comedi%d: cb_pcimdas: remove\n", dev->minor);
+ pr_info("comedi%d: cb_pcimdas: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv) {
--
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/