Commit 18653919 authored by Benjamin Adolphi's avatar Benjamin Adolphi Committed by Greg Kroah-Hartman

Staging: comedi: pcl724: Checkpatch cleanups

This fixes all checkpatch issues in the pcl724 comedi driver.
Signed-off-by: default avatarBenjamin Adolphi <b.adolphi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 266bfbdd
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
[0] - IO Base [0] - IO Base
[1] - IRQ (0=disable IRQ) IRQ isn't supported at this time! [1] - IRQ (0=disable IRQ) IRQ isn't supported at this time!
[2] -number of DIO: [2] -number of DIO:
0, 144: 144 DIO configuration 0, 144: 144 DIO configuration
1, 96: 96 DIO configuration 1, 96: 96 DIO configuration
*/ */
/* /*
...@@ -137,8 +137,8 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -137,8 +137,8 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iorange = this_board->io_range; iorange = this_board->io_range;
if ((this_board->can_have96) && ((it->options[1] == 1) if ((this_board->can_have96) && ((it->options[1] == 1)
|| (it->options[1] == 96))) || (it->options[1] == 96)))
iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */ iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */
printk("comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor, printk(KERN_INFO "comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor,
this_board->name, iobase); this_board->name, iobase);
if (!request_region(iobase, iorange, "pcl724")) { if (!request_region(iobase, iorange, "pcl724")) {
printk("I/O port conflict\n"); printk("I/O port conflict\n");
...@@ -155,16 +155,16 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -155,16 +155,16 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq = it->options[1]; irq = it->options[1];
if (irq) { /* we want to use IRQ */ if (irq) { /* we want to use IRQ */
if (((1 << irq) & this_board->IRQbits) == 0) { if (((1 << irq) & this_board->IRQbits) == 0) {
printk printk(KERN_WARNING
(", IRQ %u is out of allowed range, DISABLING IT", ", IRQ %u is out of allowed range, "
irq); "DISABLING IT", irq);
irq = 0; /* Bad IRQ */ irq = 0; /* Bad IRQ */
} else { } else {
if (request_irq if (request_irq
(irq, interrupt_pcl724, 0, "pcl724", dev)) { (irq, interrupt_pcl724, 0, "pcl724", dev)) {
printk printk(KERN_WARNING
(", unable to allocate IRQ %u, DISABLING IT", ", unable to allocate IRQ %u, "
irq); "DISABLING IT", irq);
irq = 0; /* Can't use IRQ */ irq = 0; /* Can't use IRQ */
} else { } else {
printk(", irq=%u", irq); printk(", irq=%u", irq);
...@@ -207,16 +207,14 @@ static int pcl724_detach(struct comedi_device *dev) ...@@ -207,16 +207,14 @@ static int pcl724_detach(struct comedi_device *dev)
{ {
int i; int i;
/* printk("comedi%d: pcl724: remove\n",dev->minor); */ /* printk("comedi%d: pcl724: remove\n",dev->minor); */
for (i = 0; i < dev->n_subdevices; i++) { for (i = 0; i < dev->n_subdevices; i++)
subdev_8255_cleanup(dev, dev->subdevices + i); subdev_8255_cleanup(dev, dev->subdevices + i);
}
#ifdef PCL724_IRQ #ifdef PCL724_IRQ
if (dev->irq) { if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}
#endif #endif
release_region(dev->iobase, this_board->io_range); release_region(dev->iobase, this_board->io_range);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment