Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9b3ea3d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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



The 'bustype' 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 3a0a73b3

drivers/staging/comedi/drivers/ni_labpc.c

+0 −3
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static const struct labpc_boardinfo labpc_boards[] = { 
	{

		.name			= "lab-pc-1200",

		.ai_speed		= 10000,

		.bustype		= isa_bustype,

		.register_layout	= labpc_1200_layout,

		.has_ao			= 1,

		.ai_range_table		= &range_labpc_1200_ai,
@@ -248,7 +247,6 @@ static const struct labpc_boardinfo labpc_boards[] = { 
	}, {

		.name			= "lab-pc-1200ai",

		.ai_speed		= 10000,

		.bustype		= isa_bustype,

		.register_layout	= labpc_1200_layout,

		.ai_range_table		= &range_labpc_1200_ai,

		.ai_range_code		= labpc_1200_ai_gain_bits,
@@ -256,7 +254,6 @@ static const struct labpc_boardinfo labpc_boards[] = { 
	}, {

		.name			= "lab-pc+",

		.ai_speed		= 12000,

		.bustype		= isa_bustype,

		.register_layout	= labpc_plus_layout,

		.has_ao			= 1,

		.ai_range_table		= &range_labpc_plus_ai,

drivers/staging/comedi/drivers/ni_labpc.h

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#define EEPROM_SIZE	256	/*  256 byte eeprom */

#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 transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,

	isa_dma_transfer
@@ -37,7 +36,6 @@ struct labpc_boardinfo { 
	const char *name;

	int device_id;		/*  device id for pci and pcmcia boards */

	int ai_speed;		/*  maximum input speed in nanoseconds */

	enum labpc_bustype bustype;	/*  ISA/PCI/etc. */



	/*  1200 has extra registers compared to pc+ */

	enum labpc_register_layout register_layout;

drivers/staging/comedi/drivers/ni_labpc_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static const struct labpc_boardinfo labpc_cs_boards[] = { 
		.name			= "daqcard-1200",

		.device_id		= 0x103,

		.ai_speed		= 10000,

		.bustype		= pcmcia_bustype,

		.register_layout	= labpc_1200_layout,

		.has_ao			= 1,

		.ai_range_table		= &range_labpc_1200_ai,

drivers/staging/comedi/drivers/ni_labpc_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static const struct labpc_boardinfo labpc_pci_boards[] = { 
	[BOARD_NI_PCI1200] = {

		.name			= "ni_pci-1200",

		.ai_speed		= 10000,

		.bustype		= pci_bustype,

		.register_layout	= labpc_1200_layout,

		.has_ao			= 1,

		.ai_range_table		= &range_labpc_1200_ai,