Skip to content

Commit

Permalink
Staging: comedi: fix printk issue in adv_pci_dio.c
Browse files Browse the repository at this point in the history
This is a patch to the adv_pci_dio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

converted printks to dev_version.
Removed unnecessary printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent e75aca9 commit f15d651
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions drivers/staging/comedi/drivers/adv_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1106,13 +1106,10 @@ static int pci_dio_attach(struct comedi_device *dev,
unsigned long iobase;
struct pci_dev *pcidev = NULL;

printk("comedi%d: adv_pci_dio: ", dev->minor);

ret = alloc_private(dev, sizeof(struct pci_dio_private));
if (ret < 0) {
printk(", Error: Cann't allocate private memory!\n");
if (ret < 0)
return -ENOMEM;
}

for_each_pci_dev(pcidev) {
/* loop through cards supported by this driver */
Expand Down Expand Up @@ -1140,19 +1137,18 @@ static int pci_dio_attach(struct comedi_device *dev,
}

if (!dev->board_ptr) {
printk(", Error: Requested type of the card was not found!\n");
dev_err(dev->hw_dev, "Error: Requested type of the card was not found!\n");
return -EIO;
}

if (comedi_pci_enable(pcidev, driver_pci_dio.driver_name)) {
printk
(", Error: Can't enable PCI device and request regions!\n");
dev_err(dev->hw_dev, "Error: Can't enable PCI device and request regions!\n");
return -EIO;
}
iobase = pci_resource_start(pcidev, this_board->main_pci_region);
printk(", b:s:f=%d:%d:%d, io=0x%4lx",
pcidev->bus->number, PCI_SLOT(pcidev->devfn),
PCI_FUNC(pcidev->devfn), iobase);
dev_dbg(dev->hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n",
pcidev->bus->number, PCI_SLOT(pcidev->devfn),
PCI_FUNC(pcidev->devfn), iobase);

dev->iobase = iobase;
dev->board_name = this_board->name;
Expand All @@ -1177,15 +1173,10 @@ static int pci_dio_attach(struct comedi_device *dev,
}

ret = alloc_subdevices(dev, n_subdevices);
if (ret < 0) {
printk(", Error: Cann't allocate subdevice memory!\n");
if (ret < 0)
return ret;
}

printk(".\n");

subdev = 0;

for (i = 0; i < MAX_DI_SUBDEVS; i++)
if (this_board->sdi[i].chans) {
s = dev->subdevices + subdev;
Expand Down

0 comments on commit f15d651

Please sign in to comment.