Commit 062bc6fe authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: aio_aio12_8: 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 f853d9dd
...@@ -84,8 +84,6 @@ struct aio12_8_private { ...@@ -84,8 +84,6 @@ struct aio12_8_private {
unsigned int ao_readback[4]; unsigned int ao_readback[4];
}; };
#define devpriv ((struct aio12_8_private *) dev->private)
static int aio_aio12_8_ai_read(struct comedi_device *dev, static int aio_aio12_8_ai_read(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)
...@@ -125,6 +123,7 @@ static int aio_aio12_8_ao_read(struct comedi_device *dev, ...@@ -125,6 +123,7 @@ static int aio_aio12_8_ao_read(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)
{ {
struct aio12_8_private *devpriv = dev->private;
int i; int i;
int val = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; int val = devpriv->ao_readback[CR_CHAN(insn->chanspec)];
...@@ -137,6 +136,7 @@ static int aio_aio12_8_ao_write(struct comedi_device *dev, ...@@ -137,6 +136,7 @@ static int aio_aio12_8_ao_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)
{ {
struct aio12_8_private *devpriv = dev->private;
int i; int i;
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
unsigned long port = dev->iobase + AIO12_8_DAC_0 + (2 * chan); unsigned long port = dev->iobase + AIO12_8_DAC_0 + (2 * chan);
...@@ -166,6 +166,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev, ...@@ -166,6 +166,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
const struct aio12_8_boardtype *board = comedi_board(dev); const struct aio12_8_boardtype *board = comedi_board(dev);
struct aio12_8_private *devpriv;
int iobase; int iobase;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ret; int ret;
...@@ -180,8 +181,10 @@ static int aio_aio12_8_attach(struct comedi_device *dev, ...@@ -180,8 +181,10 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
dev->iobase = iobase; dev->iobase = iobase;
if (alloc_private(dev, sizeof(struct aio12_8_private)) < 0) ret = alloc_private(dev, sizeof(*devpriv));
return -ENOMEM; if (ret)
return ret;
devpriv = dev->private;
ret = comedi_alloc_subdevices(dev, 3); ret = comedi_alloc_subdevices(dev, 3);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment