staging: comedi: addi_apci_1516: merge in addi_apci_2016 driver

Browse source

The low-level hardware support code for these drivers, hwdrv_apci1516.c
and hwdrv_apci2016.c, is identical. Both of these boards are 16 channel
dio boards. The 1516 board has 8 input/8 output channels and the 2016
has 16 output channels.

To ease maintainability, merge the boardinfo and pci device information
from the addi_apci_2016 driver into the addi_apci_1516 driver and modify
the Kconfig and Makefile appropriately.

This allows deleting the addi_apci_2016.c and hwdrv_apci2016.c files.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

H Hartley Sweeten 2012-11-13 13:36:19 -07:00 • committed by Greg Kroah-Hartman

parent 848ce5112e

commit 2a366e7b9d

5 changed files with 19 additions and 320 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/staging/comedi/Kconfig

View file

1

drivers/staging/comedi/drivers/Makefile

View file

240

drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c

View file

17

drivers/staging/comedi/drivers/addi_apci_1516.c

View file

68

drivers/staging/comedi/drivers/addi_apci_2016.c

View file