Skip to content

L
linux
Commit 79d3a1dd authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: adv_pci_dio: remove '0' boardinfo data 

Remove all the boardinfo data that is simply '0'.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59bd6752
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 84 deletions
drivers/staging/comedi/drivers/adv_pci_dio.c
View file @ 79d3a1dd
...@@ -260,10 +260,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -260,10 +260,7 @@ static const struct dio_boardtype boardtypes[] = {
.sdi[1] = { 16, PCI1730_IDI, 2, 0, }, .sdi[1] = { 16, PCI1730_IDI, 2, 0, },
.sdo[0] = { 16, PCI1730_DO, 2, 0, }, .sdo[0] = { 16, PCI1730_DO, 2, 0, },
.sdo[1] = { 16, PCI1730_IDO, 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, }, .boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b, .io_access = IO_8b,
}, { }, {
.name = "pci1733", .name = "pci1733",
...@@ -271,14 +268,8 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -271,14 +268,8 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1733, .device_id = 0x1733,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1733, .cardtype = TYPE_PCI1733,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 32, PCI1733_IDI, 4, 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, }, .boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b, .io_access = IO_8b,
}, { }, {
.name = "pci1734", .name = "pci1734",
...@@ -286,14 +277,8 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -286,14 +277,8 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1734, .device_id = 0x1734,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1734, .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, }, .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, }, .boardid = { 4, PCI173x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b, .io_access = IO_8b,
}, { }, {
.name = "pci1735", .name = "pci1735",
...@@ -302,11 +287,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -302,11 +287,7 @@ static const struct dio_boardtype boardtypes[] = {
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1735, .cardtype = TYPE_PCI1735,
.sdi[0] = { 32, PCI1735_DI, 4, 0, }, .sdi[0] = { 32, PCI1735_DI, 4, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 32, PCI1735_DO, 4, 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, }, .boardid = { 4, PCI1735_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 3, PCI1735_C8254, 1, 0, }, .s8254[0] = { 3, PCI1735_C8254, 1, 0, },
.io_access = IO_8b, .io_access = IO_8b,
...@@ -316,14 +297,9 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -316,14 +297,9 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1736, .device_id = 0x1736,
.main_pci_region = PCI1736_MAINREG, .main_pci_region = PCI1736_MAINREG,
.cardtype = TYPE_PCI1736, .cardtype = TYPE_PCI1736,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 16, PCI1736_IDI, 2, 0, }, .sdi[1] = { 16, PCI1736_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1736_IDO, 2, 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, }, .boardid = { 4, PCI1736_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_8b, .io_access = IO_8b,
}, { }, {
.name = "pci1739", .name = "pci1739",
...@@ -331,14 +307,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -331,14 +307,7 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1739, .device_id = 0x1739,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1739, .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[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, .io_access = IO_8b,
}, { }, {
.name = "pci1750", .name = "pci1750",
...@@ -346,14 +315,8 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -346,14 +315,8 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1750, .device_id = 0x1750,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1750, .cardtype = TYPE_PCI1750,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 16, PCI1750_IDI, 2, 0, }, .sdi[1] = { 16, PCI1750_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1750_IDO, 2, 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, .io_access = IO_8b,
}, { }, {
.name = "pci1751", .name = "pci1751",
...@@ -361,13 +324,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -361,13 +324,7 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1751, .device_id = 0x1751,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1751, .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[0] = { 48, PCI1751_DIO, 2, 0, },
.sdio[1] = { 0, 0, 0, 0, },
.boardid = { 0, 0, 0, 0, },
.s8254[0] = { 3, PCI1751_CNT, 1, 0, }, .s8254[0] = { 3, PCI1751_CNT, 1, 0, },
.io_access = IO_8b, .io_access = IO_8b,
}, { }, {
...@@ -376,14 +333,9 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -376,14 +333,9 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1752, .device_id = 0x1752,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1752, .cardtype = TYPE_PCI1752,
.sdi[0] = { 0, 0, 0, 0, },
.sdi[1] = { 0, 0, 0, 0, },
.sdo[0] = { 32, PCI1752_IDO, 2, 0, }, .sdo[0] = { 32, PCI1752_IDO, 2, 0, },
.sdo[1] = { 32, PCI1752_IDO2, 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, }, .boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b, .io_access = IO_16b,
}, { }, {
.name = "pci1753", .name = "pci1753",
...@@ -391,14 +343,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -391,14 +343,7 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1753, .device_id = 0x1753,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1753, .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[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, .io_access = IO_8b,
}, { }, {
.name = "pci1753e", .name = "pci1753e",
...@@ -406,14 +351,8 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -406,14 +351,8 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1753, .device_id = 0x1753,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1753E, .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[0] = { 96, PCI1753_DIO, 4, 0, },
.sdio[1] = { 96, PCI1753E_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, .io_access = IO_8b,
}, { }, {
.name = "pci1754", .name = "pci1754",
...@@ -423,12 +362,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -423,12 +362,7 @@ static const struct dio_boardtype boardtypes[] = {
.cardtype = TYPE_PCI1754, .cardtype = TYPE_PCI1754,
.sdi[0] = { 32, PCI1754_IDI, 2, 0, }, .sdi[0] = { 32, PCI1754_IDI, 2, 0, },
.sdi[1] = { 32, PCI1754_IDI2, 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, }, .boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b, .io_access = IO_16b,
}, { }, {
.name = "pci1756", .name = "pci1756",
...@@ -436,14 +370,9 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -436,14 +370,9 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1756, .device_id = 0x1756,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1756, .cardtype = TYPE_PCI1756,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 32, PCI1756_IDI, 2, 0, }, .sdi[1] = { 32, PCI1756_IDI, 2, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 32, PCI1756_IDO, 2, 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, }, .boardid = { 4, PCI175x_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b, .io_access = IO_16b,
}, { }, {
/* This card has its own 'attach' */ /* This card has its own 'attach' */
...@@ -452,14 +381,6 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -452,14 +381,6 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1760, .device_id = 0x1760,
.main_pci_region = 0, .main_pci_region = 0,
.cardtype = TYPE_PCI1760, .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, .io_access = IO_8b,
}, { }, {
.name = "pci1762", .name = "pci1762",
...@@ -467,14 +388,9 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -467,14 +388,9 @@ static const struct dio_boardtype boardtypes[] = {
.device_id = 0x1762, .device_id = 0x1762,
.main_pci_region = PCIDIO_MAINREG, .main_pci_region = PCIDIO_MAINREG,
.cardtype = TYPE_PCI1762, .cardtype = TYPE_PCI1762,
.sdi[0] = { 0, 0, 0, 0,},
.sdi[1] = { 16, PCI1762_IDI, 1, 0, }, .sdi[1] = { 16, PCI1762_IDI, 1, 0, },
.sdo[0] = { 0, 0, 0, 0, },
.sdo[1] = { 16, PCI1762_RO, 1, 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, }, .boardid = { 4, PCI1762_BOARDID, 1, SDF_INTERNAL, },
.s8254[0] = { 0, 0, 0, 0, },
.io_access = IO_16b, .io_access = IO_16b,
}, },
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7