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

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

staging: comedi: ni_tio: make ni_tio_rinsn() a proper comedi (*insn_read) 



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

For aesthetics, rename the function.

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 00edbc31

drivers/staging/comedi/drivers/ni_660x.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -975,15 +975,6 @@ static void ni_660x_free_mite_rings(struct comedi_device *dev) 
	}

	}

}

}





static int

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

		   struct comedi_insn *insn, unsigned int *data)

{

	struct ni_gpct *counter = s->private;



	return ni_tio_rinsn(counter, insn, data);

}



static void init_tio_chip(struct comedi_device *dev, int chipset)

static void init_tio_chip(struct comedi_device *dev, int chipset)

{

{

	struct ni_660x_private *devpriv = dev->private;

	struct ni_660x_private *devpriv = dev->private;
@@ -1241,7 +1232,7 @@ static int ni_660x_auto_attach(struct comedi_device *dev, 
			    SDF_CMD_READ /* | SDF_CMD_WRITE */ ;

			    SDF_CMD_READ /* | SDF_CMD_WRITE */ ;

			s->n_chan = 3;

			s->n_chan = 3;

			s->maxdata = 0xffffffff;

			s->maxdata = 0xffffffff;

			s->insn_read = ni_660x_GPCT_rinsn;

			s->insn_read = ni_tio_insn_read;

			s->insn_write = ni_660x_GPCT_winsn;

			s->insn_write = ni_660x_GPCT_winsn;

			s->insn_config = ni_660x_GPCT_insn_config;

			s->insn_config = ni_660x_GPCT_insn_config;

			s->do_cmd = &ni_660x_cmd;

			s->do_cmd = &ni_660x_cmd;

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -279,9 +279,6 @@ static int ni_8255_callback(int dir, int port, int data, unsigned long arg); 
static int ni_gpct_insn_write(struct comedi_device *dev,

static int ni_gpct_insn_write(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data);

			      struct comedi_insn *insn, unsigned int *data);

static int ni_gpct_insn_read(struct comedi_device *dev,

			     struct comedi_subdevice *s,

			     struct comedi_insn *insn, unsigned int *data);

static int ni_gpct_insn_config(struct comedi_device *dev,

static int ni_gpct_insn_config(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data);

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

			s->maxdata = 0xffffffff;

		else

		else

			s->maxdata = 0xffffff;

			s->maxdata = 0xffffff;

		s->insn_read = &ni_gpct_insn_read;

		s->insn_read = ni_tio_insn_read;

		s->insn_write = &ni_gpct_insn_write;

		s->insn_write = &ni_gpct_insn_write;

		s->insn_config = &ni_gpct_insn_config;

		s->insn_config = &ni_gpct_insn_config;

#ifdef PCIDMA

#ifdef PCIDMA
@@ -5023,14 +5020,6 @@ static int ni_gpct_insn_config(struct comedi_device *dev, 
	return ni_tio_insn_config(counter, insn, data);

	return ni_tio_insn_config(counter, insn, data);

}

}





static int ni_gpct_insn_read(struct comedi_device *dev,

			     struct comedi_subdevice *s,

			     struct comedi_insn *insn, unsigned int *data)

{

	struct ni_gpct *counter = s->private;

	return ni_tio_rinsn(counter, insn, data);

}



static int ni_gpct_insn_write(struct comedi_device *dev,

static int ni_gpct_insn_write(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data)

			      struct comedi_insn *insn, unsigned int *data)

drivers/staging/comedi/drivers/ni_tio.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -1579,9 +1579,12 @@ int ni_tio_insn_config(struct ni_gpct *counter, 
}

}

EXPORT_SYMBOL_GPL(ni_tio_insn_config);

EXPORT_SYMBOL_GPL(ni_tio_insn_config);





int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn,

int ni_tio_insn_read(struct comedi_device *dev,

		     struct comedi_subdevice *s,

		     struct comedi_insn *insn,

		     unsigned int *data)

		     unsigned int *data)

{

{

	struct ni_gpct *counter = s->private;

	struct ni_gpct_device *counter_dev = counter->counter_dev;

	struct ni_gpct_device *counter_dev = counter->counter_dev;

	const unsigned channel = CR_CHAN(insn->chanspec);

	const unsigned channel = CR_CHAN(insn->chanspec);

	unsigned cidx = counter->counter_index;

	unsigned cidx = counter->counter_index;
@@ -1621,7 +1624,7 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn, 
	}

	}

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(ni_tio_rinsn);

EXPORT_SYMBOL_GPL(ni_tio_insn_read);





static unsigned ni_tio_next_load_register(struct ni_gpct *counter)

static unsigned ni_tio_next_load_register(struct ni_gpct *counter)

{

{

drivers/staging/comedi/drivers/ni_tio.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,8 @@ ni_gpct_device_construct(struct comedi_device *, 
			 unsigned num_counters);

			 unsigned num_counters);

void ni_gpct_device_destroy(struct ni_gpct_device *);

void ni_gpct_device_destroy(struct ni_gpct_device *);

void ni_tio_init_counter(struct ni_gpct *);

void ni_tio_init_counter(struct ni_gpct *);

int ni_tio_rinsn(struct ni_gpct *, struct comedi_insn *, unsigned int *data);

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 *,

int ni_tio_insn_config(struct ni_gpct *, struct comedi_insn *,

		       unsigned int *data);

		       unsigned int *data);

int ni_tio_winsn(struct ni_gpct *, struct comedi_insn *, unsigned int *data);

int ni_tio_winsn(struct ni_gpct *, struct comedi_insn *, unsigned int *data);