[PATCH 2/9] Staging: comedi: fix printk issue in cb_pcidda.c

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


This is a patch to the cb_pcidda.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_pcidda.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 49102b3..3dddffe 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -282,7 +282,8 @@ static int cb_pcidda_attach(struct comedi_device *dev,
struct pci_dev *pcidev = NULL;
int index;

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

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

for_each_pci_dev(pcidev) {
if (pcidev->vendor == PCI_VENDOR_ID_CB) {
@@ -312,22 +312,24 @@ static int cb_pcidda_attach(struct comedi_device *dev,
}
}
if (!pcidev) {
- printk
- ("Not a ComputerBoards/MeasurementComputing card on requested position\n");
+ dev_err(&pcidev->dev, "Not a "
+ "ComputerBoards/MeasurementComputing "
+ "card on requested position\n");
return -EIO;
}
found:
devpriv->pci_dev = pcidev;
dev->board_ptr = cb_pcidda_boards + index;
/* "thisboard" macro can be used from here. */
- printk("Found %s at requested position\n", thisboard->name);
+ dev_info(&pcidev->dev, "Found %s at requested position\n",
+ thisboard->name);

/*
* Enable PCI device and request regions.
*/
if (comedi_pci_enable(pcidev, thisboard->name)) {
- printk
- ("cb_pcidda: failed to enable PCI device and request regions\n");
+ dev_err(&pcidev->dev, "cb_pcidda: failed to enable PCI "
+ "device and request regions\n");
return -EIO;
}

@@ -377,12 +379,8 @@ found:
s = dev->subdevices + 2;
subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A);

- printk(" eeprom:");
- for (index = 0; index < EEPROM_SIZE; index++) {
+ for (index = 0; index < EEPROM_SIZE; index++)
devpriv->eeprom_data[index] = cb_pcidda_read_eeprom(dev, index);
- printk(" %i:0x%x ", index, devpriv->eeprom_data[index]);
- }
- printk("\n");

/* set calibrations dacs */
for (index = 0; index < thisboard->ao_chans; index++)
@@ -417,7 +415,7 @@ static int cb_pcidda_detach(struct comedi_device *dev)
subdev_8255_cleanup(dev, dev->subdevices + 2);
}

- printk("comedi%d: cb_pcidda: remove\n", dev->minor);
+ pr_info("comedi%d: cb_pcidda: remove\n", dev->minor);

return 0;
}
--
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/