Commit d9d238d8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adv_pci_dio: remove defines used for the 'timer_regbase'

These defines are only used to initialize the 'timer_regbase' boardinfo.
For aesthetics, just open-code the values and remove the defines.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2001807e
...@@ -64,7 +64,6 @@ enum hw_cards_id { ...@@ -64,7 +64,6 @@ enum hw_cards_id {
/* Advantech PCI-1735U */ /* Advantech PCI-1735U */
#define PCI1735_DI 0 /* R: Digital input 0-31 */ #define PCI1735_DI 0 /* R: Digital input 0-31 */
#define PCI1735_DO 0 /* W: Digital output 0-31 */ #define PCI1735_DO 0 /* W: Digital output 0-31 */
#define PCI1735_C8254 4 /* R/W: 8254 counter */
/* Advantech PCI-1736UP */ /* Advantech PCI-1736UP */
#define PCI1736_IDI 0 /* R: Isolated digital input 0-15 */ #define PCI1736_IDI 0 /* R: Isolated digital input 0-15 */
...@@ -87,7 +86,6 @@ enum hw_cards_id { ...@@ -87,7 +86,6 @@ enum hw_cards_id {
/* Advantech PCI-1751/3/3E */ /* Advantech PCI-1751/3/3E */
#define PCI1751_DIO 0 /* R/W: begin of 8255 registers block */ #define PCI1751_DIO 0 /* R/W: begin of 8255 registers block */
#define PCI1751_CNT 24 /* R/W: begin of 8254 registers block */
#define PCI1751_ICR 32 /* W: Interrupt control register */ #define PCI1751_ICR 32 /* W: Interrupt control register */
#define PCI1751_ISR 32 /* R: Interrupt status register */ #define PCI1751_ISR 32 /* R: Interrupt status register */
#define PCI1753_DIO 0 /* R/W: begin of 8255 registers block */ #define PCI1753_DIO 0 /* R/W: begin of 8255 registers block */
...@@ -169,7 +167,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -169,7 +167,7 @@ static const struct dio_boardtype boardtypes[] = {
.sdi[0] = { 32, PCI1735_DI, }, .sdi[0] = { 32, PCI1735_DI, },
.sdo[0] = { 32, PCI1735_DO, }, .sdo[0] = { 32, PCI1735_DO, },
.id_reg = 0x08, .id_reg = 0x08,
.timer_regbase = PCI1735_C8254, .timer_regbase = 0x04,
}, },
[TYPE_PCI1736] = { [TYPE_PCI1736] = {
.name = "pci1736", .name = "pci1736",
...@@ -198,7 +196,7 @@ static const struct dio_boardtype boardtypes[] = { ...@@ -198,7 +196,7 @@ static const struct dio_boardtype boardtypes[] = {
.cardtype = TYPE_PCI1751, .cardtype = TYPE_PCI1751,
.nsubdevs = 3, .nsubdevs = 3,
.sdio[0] = { 2, PCI1751_DIO, }, .sdio[0] = { 2, PCI1751_DIO, },
.timer_regbase = PCI1751_CNT, .timer_regbase = 0x18,
}, },
[TYPE_PCI1752] = { [TYPE_PCI1752] = {
.name = "pci1752", .name = "pci1752",
......
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