Skip to content

Commit

Permalink
staging: comedi: adv_pci_dio: remove '0' boardinfo data
Browse files Browse the repository at this point in the history 
Remove all the boardinfo data that is simply '0'.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 59bd675 commit 79d3a1d
Showing 1 changed file with 0 additions and 84 deletions.
84 changes: 0 additions & 84 deletions drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,40 +260,25 @@ static const struct dio_boardtype boardtypes[] = {
.sdi[1] = { 16, PCI1730_IDI, 2, 0, },
.sdo[0] = { 16, PCI1730_DO, 2, 0, },
.sdo[1] = { 16, PCI1730_IDO, 2, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1733",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1733,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1733,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 32, PCI1733_IDI, 4, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1734",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1734,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1734,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 32, PCI1734_IDO, 4, 0, },
.sdio[0] = { 0, 0, 0, 0 },
.sdio[1] = { 0, 0, 0, 0 },
.boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1735",
Expand All @@ -302,11 +287,7 @@ static const struct dio_boardtype boardtypes[] = {
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1735,
.sdi[0] = { 32, PCI1735_DI, 4, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 32, PCI1735_DO, 4, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI1735_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 3, PCI1735_C8254, 1, 0, },
.io_access = IO_8b,
Expand All @@ -316,58 +297,34 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1736,
.main_pci_region = PCI1736_MAINREG,
.cardtype = TYPE_PCI1736,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 16, PCI1736_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1736_IDO, 2, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI1736_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1739",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1739,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1739,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 48, PCI1739_DIO, 2, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1750",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1750,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1750,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 16, PCI1750_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1750_IDO, 2, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1751",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1751,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1751,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 48, PCI1751_DIO, 2, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 3, PCI1751_CNT, 1, 0, },
.io_access = IO_8b,
}, {
Expand All @@ -376,44 +333,26 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1752,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1752,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 32, PCI1752_IDO, 2, 0, },
.sdo[1] = { 32, PCI1752_IDO2, 2, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b,
}, {
.name = "pci1753",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1753,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1753,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 96, PCI1753_DIO, 4, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1753e",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1753,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1753E,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 96, PCI1753_DIO, 4, 0, },
.sdio[1] = { 96, PCI1753E_DIO, 4, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1754",
Expand All @@ -423,27 +362,17 @@ static const struct dio_boardtype boardtypes[] = {
.cardtype = TYPE_PCI1754,
.sdi[0] = { 32, PCI1754_IDI, 2, 0, },
.sdi[1] = { 32, PCI1754_IDI2, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b,
}, {
.name = "pci1756",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1756,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1756,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 32, PCI1756_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 32, PCI1756_IDO, 2, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b,
}, {
/* This card has its own 'attach' */
Expand All @@ -452,29 +381,16 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1760,
.main_pci_region = 0,
.cardtype = TYPE_PCI1760,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 0, 0, 0, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b,
}, {
.name = "pci1762",
.vendor_id = PCI_VENDOR_ID_ADVANTECH,
.device_id = 0x1762,
.main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1762,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 16, PCI1762_IDI, 1, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1762_RO, 1, 0, },
.sdio[0] = { 0, 0, 0, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 4, PCI1762_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b,
},
};
Expand Down

0 comments on commit 79d3a1d

Please sign in to comment.