forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: adl_pci6208: remove thisboard and devpriv macros

Browse source 
The 'thisboard' and 'devpriv' macros rely on a local variable having
a specific name and yield pointers derived from that local variable.
Replace the macros with local variables where used. Use the
comedi_board() helper to get the 'thisboard' pointer.

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>
This commit is contained in:
H Hartley Sweeten 2012-06-27 14:53:28 -07:00 • committed by Greg Kroah-Hartman
parent ac55ca32ca
commit 949a18d39d
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/comedi/drivers/adl_pci6208.c
View file

@ -82,21 +82,17 @@ static const struct pci6208_board pci6208_boards[] = {
} }
}; };
/* Will be initialized in pci6208_find device(). */
#define thisboard ((const struct pci6208_board *)dev->board_ptr)
struct pci6208_private { struct pci6208_private {
int data; int data;
struct pci_dev *pci_dev; /* for a PCI device */ struct pci_dev *pci_dev; /* for a PCI device */
unsigned int ao_readback[2]; /* Used for AO readback */ unsigned int ao_readback[2]; /* Used for AO readback */
}; };
#define devpriv ((struct pci6208_private *)dev->private)
static int pci6208_ao_winsn(struct comedi_device *dev, static int pci6208_ao_winsn(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 pci6208_private *devpriv = dev->private;
int i = 0, Data_Read; int i = 0, Data_Read;
unsigned short chan = CR_CHAN(insn->chanspec); unsigned short chan = CR_CHAN(insn->chanspec);
unsigned long invert = 1 << (16 - 1); unsigned long invert = 1 << (16 - 1);
@ -123,6 +119,7 @@ static int pci6208_ao_rinsn(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 pci6208_private *devpriv = dev->private;
int i; int i;
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
@ -183,6 +180,7 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
static int pci6208_find_device(struct comedi_device *dev, int bus, int slot) static int pci6208_find_device(struct comedi_device *dev, int bus, int slot)
{ {
struct pci6208_private *devpriv = dev->private;
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
int i; int i;
@ -278,19 +276,23 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
static int pci6208_attach(struct comedi_device *dev, static int pci6208_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
const struct pci6208_board *thisboard;
struct pci6208_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int retval; int retval;
unsigned long io_base; unsigned long io_base;
printk(KERN_INFO "comedi%d: pci6208: ", dev->minor); printk(KERN_INFO "comedi%d: pci6208: ", dev->minor);
retval = alloc_private(dev, sizeof(struct pci6208_private)); retval = alloc_private(dev, sizeof(*devpriv));
if (retval < 0) if (retval < 0)
return retval; return retval;
devpriv = dev->private;
retval = pci6208_find_device(dev, it->options[0], it->options[1]); retval = pci6208_find_device(dev, it->options[0], it->options[1]);
if (retval < 0) if (retval < 0)
return retval; return retval;
thisboard = comedi_board(dev);
retval = pci6208_pci_setup(devpriv->pci_dev, &io_base, dev->minor); retval = pci6208_pci_setup(devpriv->pci_dev, &io_base, dev->minor);
if (retval < 0) if (retval < 0)
@ -330,6 +332,8 @@ static int pci6208_attach(struct comedi_device *dev,
static void pci6208_detach(struct comedi_device *dev) static void pci6208_detach(struct comedi_device *dev)
{ {
struct pci6208_private *devpriv = dev->private;
if (devpriv && devpriv->pci_dev) { if (devpriv && devpriv->pci_dev) {
if (dev->iobase) if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);