Commit 5afb56cd authored Mar 18, 2013 by Ian Abbott Committed by Greg Kroah-Hartman Mar 25, 2013

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



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>

parent e067666a

drivers/staging/comedi/drivers/amplc_dio200.c

+4 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}
		break;
		default:
		s->type = COMEDI_SUBD_UNUSED;
		@@ -1904,8 +1899,6 @@ 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);
		break;
		default: