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

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

staging: comedi: addi_apci_3120: remove boardinfo 'i_NbrDiChannel' 



All boardinfo entries have this member set as '4'. Remove the member and
initialize the Digial Input 'n_chan' with 4 directly.

Also, remove the initialization of 'len_chanlist'. This member is only
used with subdevices that support async commands.

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 4241d6b8

drivers/staging/comedi/drivers/addi_apci_3120.c

+1 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ struct apci3120_board { 
	int i_NbrAoChannel;

	int i_AiMaxdata;

	int i_AoMaxdata;

	int i_NbrDiChannel;

};



static const struct apci3120_board apci3120_boardtypes[] = {
@@ -34,7 +33,6 @@ static const struct apci3120_board apci3120_boardtypes[] = { 
		.i_NbrAoChannel		= 8,

		.i_AiMaxdata		= 0xffff,

		.i_AoMaxdata		= 0x3fff,

		.i_NbrDiChannel		= 4,

	},

	[BOARD_APCI3001] = {

		.name			= "apci3001",
@@ -42,7 +40,6 @@ static const struct apci3120_board apci3120_boardtypes[] = { 
		.i_NbrAiChannelDiff	= 8,

		.i_AiChannelList	= 16,

		.i_AiMaxdata		= 0xfff,

		.i_NbrDiChannel		= 4,

	},

};
@@ -148,9 +145,8 @@ static int apci3120_auto_attach(struct comedi_device *dev, 
	s = &dev->subdevices[2];

	s->type = COMEDI_SUBD_DI;

	s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;

	s->n_chan = this_board->i_NbrDiChannel;

	s->n_chan = 4;

	s->maxdata = 1;

	s->len_chanlist = this_board->i_NbrDiChannel;

	s->range_table = &range_digital;

	s->insn_bits = apci3120_di_insn_bits;