lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: adl_pci7296: CodingStyle cleanup

Browse Source 
Fix up printk's and other simple coding style issues.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bruce Jones
2009-09-29 10:43:29 -07:00
committed by Greg Kroah-Hartman
parent 0dfd69bfdb
commit 1ab1774f12
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/comedi/drivers/adl_pci7296.c
View File

@@ -82,8 +82,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
int bus, slot; int bus, slot;
int ret; int ret;
printk("comedi: attempt to attach...\n"); printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);
printk("comedi%d: adl_pci7432\n", dev->minor);
dev->board_name = "pci7432"; dev->board_name = "pci7432";
bus = it->options[0]; bus = it->options[0];
@@ -110,14 +109,14 @@ static int adl_pci7296_attach(struct comedi_device *dev,
} }
devpriv->pci_dev = pcidev; devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) { if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) {
printk printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
("comedi%d: Failed to enable PCI device and request regions\n",
dev->minor); dev->minor);
return -EIO; return -EIO;
} }
dev->iobase = pci_resource_start(pcidev, 2); dev->iobase = pci_resource_start(pcidev, 2);
printk("comedi: base addr %4lx\n", dev->iobase); printk(KERN_INFO "comedi: base addr %4lx\n",
dev->iobase);
/* four 8255 digital io subdevices */ /* four 8255 digital io subdevices */
s = dev->subdevices + 0; s = dev->subdevices + 0;
@@ -145,25 +144,25 @@ static int adl_pci7296_attach(struct comedi_device *dev,
if (ret < 0) if (ret < 0)
return ret; return ret;
printk("attached\n"); printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",
dev->minor);
return 1; return 1;
} }
} }
printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n", printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, bus, slot); dev->minor, bus, slot);
return -EIO; return -EIO;
} }
static int adl_pci7296_detach(struct comedi_device *dev) static int adl_pci7296_detach(struct comedi_device *dev)
{ {
printk("comedi%d: pci7432: remove\n", dev->minor); printk(KERN_INFO "comedi%d: pci7432: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) { if (devpriv && devpriv->pci_dev) {
if (dev->iobase) { if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev); pci_dev_put(devpriv->pci_dev);
} }
/* detach four 8255 digital io subdevices */ /* detach four 8255 digital io subdevices */