hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Staging: comedi: fix printk issue in daqboard2000.c 

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

converted printks to dev_printk and Removed unnecessary
printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ravishankar karkala Mallikarjunayya 2011-12-12 10:49:23 +05:30 committed by Greg Kroah-Hartman
parent aaed839599
commit 5ec8df5e46
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/daqboard2000.c
View File

@ -729,8 +729,6 @@ static int daqboard2000_attach(struct comedi_device *dev,
unsigned int aux_len; unsigned int aux_len;
int bus, slot; int bus, slot;
printk("comedi%d: daqboard2000:", dev->minor);
bus = it->options[0]; bus = it->options[0];
slot = it->options[1]; slot = it->options[1];
@ -751,10 +749,10 @@ static int daqboard2000_attach(struct comedi_device *dev,
} }
if (!card) { if (!card) {
if (bus || slot) if (bus || slot)
printk(" no daqboard2000 found at bus/slot: %d/%d\n", dev_err(dev->hw_dev, "no daqboard2000 found at bus/slot: %d/%d\n",
bus, slot); bus, slot);
else else
printk(" no daqboard2000 found\n"); dev_err(dev->hw_dev, "no daqboard2000 found\n");
return -EIO; return -EIO;
} else { } else {
u32 id; u32 id;
@ -764,7 +762,8 @@ static int daqboard2000_attach(struct comedi_device *dev,
subsystem_device << 16) | card->subsystem_vendor; subsystem_device << 16) | card->subsystem_vendor;
for (i = 0; i < n_boardtypes; i++) { for (i = 0; i < n_boardtypes; i++) {
if (boardtypes[i].id == id) { if (boardtypes[i].id == id) {
printk(" %s", boardtypes[i].name); dev_dbg(dev->hw_dev, "%s\n",
boardtypes[i].name);
dev->board_ptr = boardtypes + i; dev->board_ptr = boardtypes + i;
} }
} }
@ -778,7 +777,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
result = comedi_pci_enable(card, "daqboard2000"); result = comedi_pci_enable(card, "daqboard2000");
if (result < 0) { if (result < 0) {
printk(" failed to enable PCI device and request regions\n"); dev_err(dev->hw_dev, "failed to enable PCI device and request regions\n");
return -EIO; return -EIO;
} }
devpriv->got_regions = 1; devpriv->got_regions = 1;
@ -808,7 +807,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
if (aux_data && aux_len) { if (aux_data && aux_len) {
result = initialize_daqboard2000(dev, aux_data, aux_len); result = initialize_daqboard2000(dev, aux_data, aux_len);
} else { } else {
printk("no FPGA initialization code, aborting\n"); dev_dbg(dev->hw_dev, "no FPGA initialization code, aborting\n");
result = -EIO; result = -EIO;
} }
if (result < 0) if (result < 0)
@ -848,15 +847,12 @@ static int daqboard2000_attach(struct comedi_device *dev,
result = subdev_8255_init(dev, s, daqboard2000_8255_cb, result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
(unsigned long)(dev->iobase + 0x40)); (unsigned long)(dev->iobase + 0x40));
printk("\n");
out: out:
return result; return result;
} }
static int daqboard2000_detach(struct comedi_device *dev) static int daqboard2000_detach(struct comedi_device *dev)
{ {
printk("comedi%d: daqboard2000: remove\n", dev->minor);
if (dev->subdevices) if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2); subdev_8255_cleanup(dev, dev->subdevices + 2);