Skip to content

Commit

Permalink
Staging: comedi: adl_pci7296: CodingStyle cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bruce Jones authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 0dfd69b commit 1ab1774
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions drivers/staging/comedi/drivers/adl_pci7296.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
int bus, slot;
int ret;

printk("comedi: attempt to attach...\n");
printk("comedi%d: adl_pci7432\n", dev->minor);
printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);

dev->board_name = "pci7432";
bus = it->options[0];
Expand All @@ -110,14 +109,14 @@ static int adl_pci7296_attach(struct comedi_device *dev,
}
devpriv->pci_dev = pcidev;
if (comedi_pci_enable(pcidev, "adl_pci7296") < 0) {
printk
("comedi%d: Failed to enable PCI device and request regions\n",
printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
dev->minor);
return -EIO;
}

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 */
s = dev->subdevices + 0;
Expand Down Expand Up @@ -145,25 +144,25 @@ static int adl_pci7296_attach(struct comedi_device *dev,
if (ret < 0)
return ret;

printk("attached\n");
printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",
dev->minor);

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);
return -EIO;
}

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 (dev->iobase) {
if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev);
}
/* detach four 8255 digital io subdevices */
Expand Down

0 comments on commit 1ab1774

Please sign in to comment.