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

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

staging: comedi: ni_tiocmd: make ni_tio_cmd() a proper comedi (*do_cmd) 



Change the parameters to ni_tio_cmd() to make it a proper comedi
(*do_cmd) function.

The wrappers in the ni_660x and ni_mio_common modules are still needed
to request the mite channel and setup the device before actually doing
the command.

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 c3f3b431

drivers/staging/comedi/drivers/ni_660x.c

+1 −2
Original line number Diff line number Diff line
@@ -825,9 +825,8 @@ static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
		return retval;

	}

	ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);

	retval = ni_tio_cmd(counter, s->async);



	return retval;

	return ni_tio_cmd(dev, s);

}



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

drivers/staging/comedi/drivers/ni_mio_common.c

+3 −4
Original line number Diff line number Diff line
@@ -5007,9 +5007,8 @@ static void GPCT_Reset(struct comedi_device *dev, int chan) 
#ifdef PCIDMA

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

{

	int retval;

	struct ni_gpct *counter = s->private;

/* const struct comedi_cmd *cmd = &s->async->cmd; */

	int retval;



	retval = ni_request_gpct_mite_channel(dev, counter->counter_index,

					      COMEDI_INPUT);
@@ -5020,8 +5019,8 @@ static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	}

	ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);

	ni_e_series_enable_second_irq(dev, counter->counter_index, 1);

	retval = ni_tio_cmd(counter, s->async);

	return retval;



	return ni_tio_cmd(dev, s);

}

#endif

drivers/staging/comedi/drivers/ni_tio.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 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 *);

int ni_tio_cmd(struct comedi_device *, struct comedi_subdevice *);

int ni_tio_cmdtest(struct comedi_device *, struct comedi_subdevice *,

		   struct comedi_cmd *);

int ni_tio_cancel(struct ni_gpct *);

drivers/staging/comedi/drivers/ni_tiocmd.c

+3 −1
Original line number Diff line number Diff line
@@ -201,8 +201,10 @@ static int ni_tio_cmd_setup(struct ni_gpct *counter, struct comedi_async *async) 
	return retval;

}



int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)

int ni_tio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

	struct ni_gpct *counter = s->private;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;

	int retval = 0;

	unsigned long flags;