evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: amplc_dio200: don't check bus-type in dio200_common_attach()

Browse source 
The "amplc_dio200" driver is going to be split into separate drivers for
ISA and PCI cards with a common module containing most of the code.  We
don't want the common module code to depend on whether ISA boards, PCI
boards, or both are supported.  Currently, `dio200_common_attach()` and
`dio200_detach()` optimize out the code to support a timer subdevice
when built to support ISA boards only.  Remove the `if (DO_PCI)` tests
which optimize out that code.  Unfortunately, this will expand the
module's code size for an ISA-only driver a bit.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2013-03-18 17:19:07 +00:00 • committed by Greg Kroah-Hartman
parent e067666acd
commit 5afb56cda9
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/comedi/drivers/amplc_dio200.c
View file

@ -1747,14 +1747,9 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned int irq,
}
break;
case sd_timer:
/* Only on PCIe boards. */
if (DO_PCI) {
ret = dio200_subdev_timer_init(dev, s);
if (ret < 0)
return ret;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
ret = dio200_subdev_timer_init(dev, s);
if (ret < 0)
return ret;
break;
default:
s->type = COMEDI_SUBD_UNUSED;
@ -1904,9 +1899,7 @@ static void dio200_detach(struct comedi_device *dev)
dio200_subdev_intr_cleanup(dev, s);
break;
case sd_timer:
/* Only on PCIe boards. */
if (DO_PCI)
dio200_subdev_timer_cleanup(dev, s);
dio200_subdev_timer_cleanup(dev, s);
break;
default:
break;