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

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

staging: comedi: ni_tio: make ni_tio_insn_config() a proper comedi (*insn_config) 



Change the parameters to ni_tio_insn_config() to make it a proper comedi
(*insn_config) function. This allows using it directly and removing the
wrapper functions in the ni_660x and ni_mio_common modules.

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 10f74377

drivers/staging/comedi/drivers/ni_660x.c

+1 −10
Original line number Diff line number Diff line
@@ -993,15 +993,6 @@ static void init_tio_chip(struct comedi_device *dev, int chipset) 
		ni_660x_write_register(dev, chipset, 0, IOConfigReg(i));

}



static int

ni_660x_GPCT_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,

			 struct comedi_insn *insn, unsigned int *data)

{

	struct ni_gpct *counter = s->private;



	return ni_tio_insn_config(counter, insn, data);

}



static int ni_660x_dio_insn_bits(struct comedi_device *dev,

				 struct comedi_subdevice *s,

				 struct comedi_insn *insn, unsigned int *data)
@@ -1225,7 +1216,7 @@ static int ni_660x_auto_attach(struct comedi_device *dev, 
			s->maxdata = 0xffffffff;

			s->insn_read = ni_tio_insn_read;

			s->insn_write = ni_tio_insn_write;

			s->insn_config = ni_660x_GPCT_insn_config;

			s->insn_config = ni_tio_insn_config;

			s->do_cmd = &ni_660x_cmd;

			s->len_chanlist = 1;

			s->do_cmdtest = &ni_660x_cmdtest;

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −12
Original line number Diff line number Diff line
@@ -276,9 +276,6 @@ static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s); 


static int ni_8255_callback(int dir, int port, int data, unsigned long arg);



static int ni_gpct_insn_config(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data);

#ifdef PCIDMA

static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s);

static int ni_gpct_cmdtest(struct comedi_device *dev,
@@ -4441,7 +4438,7 @@ static int ni_E_init(struct comedi_device *dev) 
			s->maxdata = 0xffffff;

		s->insn_read = ni_tio_insn_read;

		s->insn_write = ni_tio_insn_read;

		s->insn_config = &ni_gpct_insn_config;

		s->insn_config = ni_tio_insn_config;

#ifdef PCIDMA

		s->subdev_flags |= SDF_CMD_READ /* | SDF_CMD_WRITE */;

		s->do_cmd = &ni_gpct_cmd;
@@ -5009,14 +5006,6 @@ static void GPCT_Reset(struct comedi_device *dev, int chan) 


#endif



static int ni_gpct_insn_config(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data)

{

	struct ni_gpct *counter = s->private;

	return ni_tio_insn_config(counter, insn, data);

}



#ifdef PCIDMA

static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

drivers/staging/comedi/drivers/ni_tio.c

+6 −2
Original line number Diff line number Diff line
@@ -1533,9 +1533,13 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned gate_index, 
	return 0;

}



int ni_tio_insn_config(struct ni_gpct *counter,

		       struct comedi_insn *insn, unsigned int *data)

int ni_tio_insn_config(struct comedi_device *dev,

		       struct comedi_subdevice *s,

		       struct comedi_insn *insn,

		       unsigned int *data)

{

	struct ni_gpct *counter = s->private;



	switch (data[0]) {

	case INSN_CONFIG_SET_COUNTER_MODE:

		return ni_tio_set_counter_mode(counter, data[1]);

drivers/staging/comedi/drivers/ni_tio.h

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ void ni_gpct_device_destroy(struct ni_gpct_device *); 
void ni_tio_init_counter(struct ni_gpct *);

int ni_tio_insn_read(struct comedi_device *, struct comedi_subdevice *,

		     struct comedi_insn *, unsigned int *data);

int ni_tio_insn_config(struct ni_gpct *, struct comedi_insn *,

		       unsigned int *data);

int ni_tio_insn_config(struct comedi_device *, struct comedi_subdevice *,

		       struct comedi_insn *, unsigned int *data);

int ni_tio_insn_write(struct comedi_device *, struct comedi_subdevice *,

		      struct comedi_insn *, unsigned int *data);

int ni_tio_cmd(struct ni_gpct *, struct comedi_async *);