diff options
| author |   H Hartley Sweeten <hartleys@visionengravers.com> | 2012-10-15 10:15:52 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 12:00:54 -0700 |
| commit | 9a1a6cf8ae5ca58171e117335b9983e3cfa2185c (patch) | |
| tree | e5bfb37438374575edc2b7e28a997b9f869ae382 /drivers/staging/comedi/drivers/rti802.c | |
| parent | staging: comedi: ni_mio_common: remove devpriv macro (diff) | |
| download | linux-dev-9a1a6cf8ae5ca58171e117335b9983e3cfa2185c.tar.xz linux-dev-9a1a6cf8ae5ca58171e117335b9983e3cfa2185c.zip | |
staging: comedi: drivers: remove remaining devpriv macros
The remaining comedi drivers that still have a devpriv macro
are all pretty straight forward for removing the devpriv
macro.
This macro relies on a local variable having a specific name.
Remove its use by replacing it with a local variable where
used.
The inline function alloc_private(), used to kzalloc the
dev->private memory, returns non-zero if there is an error.
Fix all the alloc_private() calls accordingly and remove any
kernel messages or obvious comments that still exist in the
drivers. Leave a comment in the skel driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/rti802.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/rti802.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c index 3f9d0278be50..844e75ee9c48 100644 --- a/drivers/staging/comedi/drivers/rti802.c +++ b/drivers/staging/comedi/drivers/rti802.c @@ -55,12 +55,11 @@ struct rti802_private { unsigned int ao_readback[8]; }; -#define devpriv ((struct rti802_private *)dev->private) - static int rti802_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + struct rti802_private *devpriv = dev->private; int i; for (i = 0; i < insn->n; i++) @@ -73,6 +72,7 @@ static int rti802_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + struct rti802_private *devpriv = dev->private; int i, d; int chan = CR_CHAN(insn->chanspec); @@ -89,6 +89,7 @@ static int rti802_ao_insn_write(struct comedi_device *dev, static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + struct rti802_private *devpriv; struct comedi_subdevice *s; int i; unsigned long iobase; @@ -104,8 +105,10 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->board_name = "rti802"; - if (alloc_private(dev, sizeof(struct rti802_private))) - return -ENOMEM; + ret = alloc_private(dev, sizeof(*devpriv)); + if (ret) + return ret; + devpriv = dev->private; ret = comedi_alloc_subdevices(dev, 1); if (ret) |