Skip to content

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

staging: comedi: addi_apci_3xxx: remove 'i_IorangeBase1' from boardinfo 

This data in the boardinfo is not used. Remove it.
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 5c70cbfb
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 26 deletions
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file @ 1b5f2f4f
...@@ -78,7 +78,6 @@ enum apci3xxx_boardid { ...@@ -78,7 +78,6 @@ enum apci3xxx_boardid {
struct apci3xxx_boardinfo { struct apci3xxx_boardinfo {
const char *pc_DriverName; const char *pc_DriverName;
int i_IorangeBase1;
int i_NbrAiChannel; int i_NbrAiChannel;
int i_NbrAiChannelDiff; int i_NbrAiChannelDiff;
int i_AiChannelList; int i_AiChannelList;
...@@ -95,7 +94,6 @@ struct apci3xxx_boardinfo { ...@@ -95,7 +94,6 @@ struct apci3xxx_boardinfo {
static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
[BOARD_APCI3000_16] = { [BOARD_APCI3000_16] = {
.pc_DriverName = "apci3000-16", .pc_DriverName = "apci3000-16",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -106,7 +104,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -106,7 +104,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3000_8] = { [BOARD_APCI3000_8] = {
.pc_DriverName = "apci3000-8", .pc_DriverName = "apci3000-8",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -117,7 +114,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -117,7 +114,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3000_4] = { [BOARD_APCI3000_4] = {
.pc_DriverName = "apci3000-4", .pc_DriverName = "apci3000-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 4, .i_NbrAiChannel = 4,
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
...@@ -128,7 +124,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -128,7 +124,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_16] = { [BOARD_APCI3006_16] = {
.pc_DriverName = "apci3006-16", .pc_DriverName = "apci3006-16",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -139,7 +134,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -139,7 +134,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_8] = { [BOARD_APCI3006_8] = {
.pc_DriverName = "apci3006-8", .pc_DriverName = "apci3006-8",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -150,7 +144,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -150,7 +144,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_4] = { [BOARD_APCI3006_4] = {
.pc_DriverName = "apci3006-4", .pc_DriverName = "apci3006-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 4, .i_NbrAiChannel = 4,
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
...@@ -161,7 +154,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -161,7 +154,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_16] = { [BOARD_APCI3010_16] = {
.pc_DriverName = "apci3010-16", .pc_DriverName = "apci3010-16",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -174,7 +166,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -174,7 +166,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_8] = { [BOARD_APCI3010_8] = {
.pc_DriverName = "apci3010-8", .pc_DriverName = "apci3010-8",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -187,7 +178,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -187,7 +178,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_4] = { [BOARD_APCI3010_4] = {
.pc_DriverName = "apci3010-4", .pc_DriverName = "apci3010-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 4, .i_NbrAiChannel = 4,
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
...@@ -200,7 +190,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -200,7 +190,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_16] = { [BOARD_APCI3016_16] = {
.pc_DriverName = "apci3016-16", .pc_DriverName = "apci3016-16",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -213,7 +202,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -213,7 +202,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_8] = { [BOARD_APCI3016_8] = {
.pc_DriverName = "apci3016-8", .pc_DriverName = "apci3016-8",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -226,7 +214,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -226,7 +214,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_4] = { [BOARD_APCI3016_4] = {
.pc_DriverName = "apci3016-4", .pc_DriverName = "apci3016-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 4, .i_NbrAiChannel = 4,
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
...@@ -239,7 +226,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -239,7 +226,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3100_16_4] = { [BOARD_APCI3100_16_4] = {
.pc_DriverName = "apci3100-16-4", .pc_DriverName = "apci3100-16-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -252,7 +238,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -252,7 +238,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3100_8_4] = { [BOARD_APCI3100_8_4] = {
.pc_DriverName = "apci3100-8-4", .pc_DriverName = "apci3100-8-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -265,7 +250,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -265,7 +250,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3106_16_4] = { [BOARD_APCI3106_16_4] = {
.pc_DriverName = "apci3106-16-4", .pc_DriverName = "apci3106-16-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -278,7 +262,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -278,7 +262,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3106_8_4] = { [BOARD_APCI3106_8_4] = {
.pc_DriverName = "apci3106-8-4", .pc_DriverName = "apci3106-8-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -291,7 +274,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -291,7 +274,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3110_16_4] = { [BOARD_APCI3110_16_4] = {
.pc_DriverName = "apci3110-16-4", .pc_DriverName = "apci3110-16-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -306,7 +288,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -306,7 +288,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3110_8_4] = { [BOARD_APCI3110_8_4] = {
.pc_DriverName = "apci3110-8-4", .pc_DriverName = "apci3110-8-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -321,7 +302,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -321,7 +302,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3116_16_4] = { [BOARD_APCI3116_16_4] = {
.pc_DriverName = "apci3116-16-4", .pc_DriverName = "apci3116-16-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 16, .i_NbrAiChannel = 16,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
...@@ -336,7 +316,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -336,7 +316,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3116_8_4] = { [BOARD_APCI3116_8_4] = {
.pc_DriverName = "apci3116-8-4", .pc_DriverName = "apci3116-8-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannel = 8, .i_NbrAiChannel = 8,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
...@@ -351,7 +330,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -351,7 +330,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3003] = { [BOARD_APCI3003] = {
.pc_DriverName = "apci3003", .pc_DriverName = "apci3003",
.i_IorangeBase1 = 256,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
...@@ -362,7 +340,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -362,7 +340,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_16] = { [BOARD_APCI3002_16] = {
.pc_DriverName = "apci3002-16", .pc_DriverName = "apci3002-16",
.i_IorangeBase1 = 256,
.i_NbrAiChannelDiff = 16, .i_NbrAiChannelDiff = 16,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
...@@ -373,7 +350,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -373,7 +350,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_8] = { [BOARD_APCI3002_8] = {
.pc_DriverName = "apci3002-8", .pc_DriverName = "apci3002-8",
.i_IorangeBase1 = 256,
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 8, .i_AiChannelList = 8,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
...@@ -384,7 +360,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -384,7 +360,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_4] = { [BOARD_APCI3002_4] = {
.pc_DriverName = "apci3002-4", .pc_DriverName = "apci3002-4",
.i_IorangeBase1 = 256,
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
...@@ -395,7 +370,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -395,7 +370,6 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3500] = { [BOARD_APCI3500] = {
.pc_DriverName = "apci3500", .pc_DriverName = "apci3500",
.i_IorangeBase1 = 256,
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24, .i_NbrTTLChannel = 24,
......
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