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

staging: comedi: adl_pci6208: remove thisboard and devpriv macros 



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: 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 ac55ca32

drivers/staging/comedi/drivers/adl_pci6208.c

+10 −6
Original line number Diff line number Diff line
@@ -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 {

	int data;

	struct pci_dev *pci_dev;	/* for a PCI device */

	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,

			    struct comedi_subdevice *s,

			    struct comedi_insn *insn, unsigned int *data)

{

	struct pci6208_private *devpriv = dev->private;

	int i = 0, Data_Read;

	unsigned short chan = CR_CHAN(insn->chanspec);

	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_insn *insn, unsigned int *data)

{

	struct pci6208_private *devpriv = dev->private;

	int i;

	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)

{

	struct pci6208_private *devpriv = dev->private;

	struct pci_dev *pci_dev = NULL;

	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,

			  struct comedi_devconfig *it)

{

	const struct pci6208_board *thisboard;

	struct pci6208_private *devpriv;

	struct comedi_subdevice *s;

	int retval;

	unsigned long io_base;



	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)

		return retval;

	devpriv = dev->private;



	retval = pci6208_find_device(dev, it->options[0], it->options[1]);

	if (retval < 0)

		return retval;

	thisboard = comedi_board(dev);



	retval = pci6208_pci_setup(devpriv->pci_dev, &io_base, dev->minor);

	if (retval < 0)
@@ -330,6 +332,8 @@ static int pci6208_attach(struct comedi_device *dev, 


static void pci6208_detach(struct comedi_device *dev)

{

	struct pci6208_private *devpriv = dev->private;



	if (devpriv && devpriv->pci_dev) {

		if (dev->iobase)

			comedi_pci_disable(devpriv->pci_dev);