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

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

staging: comedi: addi-data: remove unused vars from boardinfo 



Due to the on-going cleanup of the addi-data drivers, the boardinfo
used in the "common" code has a number of variables that are not
used. Remove the cruft.

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 d4c2fa60

drivers/staging/comedi/drivers/addi-data/addi_common.c

+0 −6
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ static int addi_auto_attach(struct comedi_device *dev, 
		s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;

		s->len_chanlist =

			devpriv->s_EeParameters.i_NbrAoChannel;

		s->range_table = this_board->pr_AoRangelist;

		s->insn_config = this_board->ao_config;

		s->insn_write = this_board->ao_write;

	} else {

		s->type = COMEDI_SUBD_UNUSED;
@@ -271,10 +269,6 @@ static int addi_auto_attach(struct comedi_device *dev, 
		s->io_bits = 0;	/* all bits input */

		s->len_chanlist = this_board->i_NbrTTLChannel;

		s->range_table = &range_digital;

		s->insn_config = this_board->ttl_config;

		s->insn_bits = this_board->ttl_bits;

		s->insn_read = this_board->ttl_read;

		s->insn_write = this_board->ttl_write;

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}

drivers/staging/comedi/drivers/addi-data/addi_common.h

+0 −16
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct addi_board { 
	int i_AiMaxdata;	/*  resolution of A/D */

	int i_AoMaxdata;	/*  resolution of D/A */

	const struct comedi_lrange *pr_AiRangelist;	/* rangelist for A/D */

	const struct comedi_lrange *pr_AoRangelist;	/* rangelist for D/A */



	int i_NbrDiChannel;	/*  Number of DI channels */

	int i_NbrDoChannel;	/*  Number of DO channels */
@@ -59,7 +58,6 @@ struct addi_board { 


	int i_Dma;		/*  dma present or not */

	int i_Timer;		/*    timer subdevice present or not */

	unsigned char b_AvailableConvertUnit;

	unsigned int ui_MinAcquisitiontimeNs;	/*  Minimum Acquisition in Nano secs */

	unsigned int ui_MinDelaytimeNs;	/*  Minimum Delay in Nano secs */
@@ -84,12 +82,8 @@ struct addi_board { 
	int (*ai_cancel)(struct comedi_device *, struct comedi_subdevice *);



	/* Analog Output */

	int (*ao_config)(struct comedi_device *, struct comedi_subdevice *,

			 struct comedi_insn *, unsigned int *);

	int (*ao_write)(struct comedi_device *, struct comedi_subdevice *,

			struct comedi_insn *, unsigned int *);

	int (*ao_bits)(struct comedi_device *, struct comedi_subdevice *,

		       struct comedi_insn *, unsigned int *);



	/* Digital Input */

	int (*di_config)(struct comedi_device *, struct comedi_subdevice *,
@@ -120,16 +114,6 @@ struct addi_board { 
			  struct comedi_insn *, unsigned int *);

	int (*timer_bits)(struct comedi_device *, struct comedi_subdevice *,

			  struct comedi_insn *, unsigned int *);



	/* TTL IO */

	int (*ttl_config)(struct comedi_device *, struct comedi_subdevice *,

			  struct comedi_insn *, unsigned int *);

	int (*ttl_bits)(struct comedi_device *, struct comedi_subdevice *,

			struct comedi_insn *, unsigned int *);

	int (*ttl_read)(struct comedi_device *, struct comedi_subdevice *,

			struct comedi_insn *, unsigned int *);

	int (*ttl_write)(struct comedi_device *, struct comedi_subdevice *,

			 struct comedi_insn *, unsigned int *);

};



/* MODULE INFO STRUCTURE */