openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_labpc: remove 'bustype' from boardinfo 

The 'bustype' in the boardinfo is not used. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-04-22 12:34:34 -07:00 committed by Greg Kroah-Hartman
parent 3a0a73b3c8
commit a9b3ea3dbb
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/comedi/drivers/ni_labpc.c
View File

@ -239,7 +239,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
{ {
.name = "lab-pc-1200", .name = "lab-pc-1200",
.ai_speed = 10000, .ai_speed = 10000,
.bustype = isa_bustype,
.register_layout = labpc_1200_layout, .register_layout = labpc_1200_layout,
.has_ao = 1, .has_ao = 1,
.ai_range_table = &range_labpc_1200_ai, .ai_range_table = &range_labpc_1200_ai,
@ -248,7 +247,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
}, { }, {
.name = "lab-pc-1200ai", .name = "lab-pc-1200ai",
.ai_speed = 10000, .ai_speed = 10000,
.bustype = isa_bustype,
.register_layout = labpc_1200_layout, .register_layout = labpc_1200_layout,
.ai_range_table = &range_labpc_1200_ai, .ai_range_table = &range_labpc_1200_ai,
.ai_range_code = labpc_1200_ai_gain_bits, .ai_range_code = labpc_1200_ai_gain_bits,
@ -256,7 +254,6 @@ static const struct labpc_boardinfo labpc_boards[] = {
}, { }, {
.name = "lab-pc+", .name = "lab-pc+",
.ai_speed = 12000, .ai_speed = 12000,
.bustype = isa_bustype,
.register_layout = labpc_plus_layout, .register_layout = labpc_plus_layout,
.has_ao = 1, .has_ao = 1,
.ai_range_table = &range_labpc_plus_ai, .ai_range_table = &range_labpc_plus_ai,

2
drivers/staging/comedi/drivers/ni_labpc.h
View File

@ -27,7 +27,6 @@
#define EEPROM_SIZE 256 /* 256 byte eeprom */ #define EEPROM_SIZE 256 /* 256 byte eeprom */
#define NUM_AO_CHAN 2 /* boards have two analog output channels */ #define NUM_AO_CHAN 2 /* boards have two analog output channels */
enum labpc_bustype { isa_bustype, pci_bustype, pcmcia_bustype };
enum labpc_register_layout { labpc_plus_layout, labpc_1200_layout }; enum labpc_register_layout { labpc_plus_layout, labpc_1200_layout };
enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer, enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
isa_dma_transfer isa_dma_transfer
@ -37,7 +36,6 @@ struct labpc_boardinfo {
const char *name; const char *name;
int device_id; /* device id for pci and pcmcia boards */ int device_id; /* device id for pci and pcmcia boards */
int ai_speed; /* maximum input speed in nanoseconds */ int ai_speed; /* maximum input speed in nanoseconds */
enum labpc_bustype bustype; /* ISA/PCI/etc. */
/* 1200 has extra registers compared to pc+ */ /* 1200 has extra registers compared to pc+ */
enum labpc_register_layout register_layout; enum labpc_register_layout register_layout;

1
drivers/staging/comedi/drivers/ni_labpc_cs.c
View File

@ -78,7 +78,6 @@ static const struct labpc_boardinfo labpc_cs_boards[] = {
.name = "daqcard-1200", .name = "daqcard-1200",
.device_id = 0x103, .device_id = 0x103,
.ai_speed = 10000, .ai_speed = 10000,
.bustype = pcmcia_bustype,
.register_layout = labpc_1200_layout, .register_layout = labpc_1200_layout,
.has_ao = 1, .has_ao = 1,
.ai_range_table = &range_labpc_1200_ai, .ai_range_table = &range_labpc_1200_ai,

1
drivers/staging/comedi/drivers/ni_labpc_pci.c
View File

@ -50,7 +50,6 @@ static const struct labpc_boardinfo labpc_pci_boards[] = {
[BOARD_NI_PCI1200] = { [BOARD_NI_PCI1200] = {
.name = "ni_pci-1200", .name = "ni_pci-1200",
.ai_speed = 10000, .ai_speed = 10000,
.bustype = pci_bustype,
.register_layout = labpc_1200_layout, .register_layout = labpc_1200_layout,
.has_ao = 1, .has_ao = 1,
.ai_range_table = &range_labpc_1200_ai, .ai_range_table = &range_labpc_1200_ai,