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

staging: comedi: comedi_test: remove devpriv macro 



This macro relies on a local variable having a specific name. Remove it.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06331fb0

drivers/staging/comedi/drivers/comedi_test.c

+16 −4
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct waveform_private { 
	unsigned timer_running:1;

	unsigned int ao_loopbacks[N_CHANS];

};

#define devpriv ((struct waveform_private *)dev->private)



/* 1000 nanosec in a microsec */

static const int nano_per_micro = 1000;
@@ -98,6 +97,7 @@ static const struct comedi_lrange waveform_ai_ranges = { 
static short fake_sawtooth(struct comedi_device *dev, unsigned int range_index,

			   unsigned long current_time)

{

	struct waveform_private *devpriv = dev->private;

	struct comedi_subdevice *s = dev->read_subdev;

	unsigned int offset = s->maxdata / 2;

	u64 value;
@@ -122,6 +122,7 @@ static short fake_squarewave(struct comedi_device *dev, 
			     unsigned int range_index,

			     unsigned long current_time)

{

	struct waveform_private *devpriv = dev->private;

	struct comedi_subdevice *s = dev->read_subdev;

	unsigned int offset = s->maxdata / 2;

	u64 value;
@@ -175,6 +176,7 @@ static short fake_waveform(struct comedi_device *dev, unsigned int channel, 
static void waveform_ai_interrupt(unsigned long arg)

{

	struct comedi_device *dev = (struct comedi_device *)arg;

	struct waveform_private *devpriv = dev->private;

	struct comedi_async *async = dev->read_subdev->async;

	struct comedi_cmd *cmd = &async->cmd;

	unsigned int i, j;
@@ -362,6 +364,7 @@ static int waveform_ai_cmdtest(struct comedi_device *dev, 
static int waveform_ai_cmd(struct comedi_device *dev,

			   struct comedi_subdevice *s)

{

	struct waveform_private *devpriv = dev->private;

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



	if (cmd->flags & TRIG_RT) {
@@ -395,6 +398,8 @@ static int waveform_ai_cmd(struct comedi_device *dev, 
static int waveform_ai_cancel(struct comedi_device *dev,

			      struct comedi_subdevice *s)

{

	struct waveform_private *devpriv = dev->private;



	devpriv->timer_running = 0;

	del_timer(&devpriv->timer);

	return 0;
@@ -404,6 +409,7 @@ static int waveform_ai_insn_read(struct comedi_device *dev, 
				 struct comedi_subdevice *s,

				 struct comedi_insn *insn, unsigned int *data)

{

	struct waveform_private *devpriv = dev->private;

	int i, chan = CR_CHAN(insn->chanspec);



	for (i = 0; i < insn->n; i++)
@@ -416,6 +422,7 @@ static int waveform_ao_insn_write(struct comedi_device *dev, 
				  struct comedi_subdevice *s,

				  struct comedi_insn *insn, unsigned int *data)

{

	struct waveform_private *devpriv = dev->private;

	int i, chan = CR_CHAN(insn->chanspec);



	for (i = 0; i < insn->n; i++)
@@ -428,6 +435,7 @@ static int waveform_attach(struct comedi_device *dev, 
			   struct comedi_devconfig *it)

{

	const struct waveform_board *board = comedi_board(dev);

	struct waveform_private *devpriv;

	struct comedi_subdevice *s;

	int amplitude = it->options[0];

	int period = it->options[1];
@@ -436,8 +444,10 @@ static int waveform_attach(struct comedi_device *dev, 


	dev->board_name = board->name;



	if (alloc_private(dev, sizeof(struct waveform_private)) < 0)

		return -ENOMEM;

	ret = alloc_private(dev, sizeof(*devpriv));

	if (ret < 0)

		return ret;

	devpriv = dev->private;



	/* set default amplitude and period */

	if (amplitude <= 0)
@@ -496,7 +506,9 @@ static int waveform_attach(struct comedi_device *dev, 


static void waveform_detach(struct comedi_device *dev)

{

	if (dev->private)

	struct waveform_private *devpriv = dev->private;



	if (devpriv)

		waveform_ai_cancel(dev, dev->read_subdev);

}