Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: cb_pcimdas: remove thisboard and devpriv macros 



These macros rely on a local variable having a specific name.
Remove them and 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 2c0db011

drivers/staging/comedi/drivers/cb_pcimdas.c

+11 −16
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ static const struct cb_pcimdas_board cb_pcimdas_boards[] = { 
	 },

};



/*

 * Useful for shorthand access to the particular board structure

 */

#define thisboard ((const struct cb_pcimdas_board *)dev->board_ptr)



/*

 * this structure is for data unique to this hardware driver.  If

 * several hardware drivers keep similar information in this structure,
@@ -137,12 +132,6 @@ struct cb_pcimdas_private { 
	unsigned int ao_readback[2];

};



/*

 * most drivers define the following macro to make it easy to

 * access the private structure.

 */

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



static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data);
@@ -193,21 +182,23 @@ static struct pci_dev *cb_pcimdas_find_pci_dev(struct comedi_device *dev, 
static int cb_pcimdas_attach(struct comedi_device *dev,

			     struct comedi_devconfig *it)

{

	const struct cb_pcimdas_board *thisboard;

	struct cb_pcimdas_private *devpriv;

	struct pci_dev *pcidev;

	struct comedi_subdevice *s;

	unsigned long iobase_8255;

	int ret;



/*

 * Allocate the private structure area.

 */

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

		return -ENOMEM;

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

	if (ret)

		return ret;

	devpriv = dev->private;



	pcidev = cb_pcimdas_find_pci_dev(dev, it);

	if (!pcidev)

		return -EIO;

	comedi_set_hw_dev(dev, &pcidev->dev);

	thisboard = comedi_board(dev);



	/*  Warn about non-tested features */

	switch (thisboard->device_id) {
@@ -299,6 +290,8 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, 
			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data)

{

	const struct cb_pcimdas_board *thisboard = comedi_board(dev);

	struct cb_pcimdas_private *devpriv = dev->private;

	int n, i;

	unsigned int d;

	unsigned int busy;
@@ -368,6 +361,7 @@ static int cb_pcimdas_ao_winsn(struct comedi_device *dev, 
			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data)

{

	struct cb_pcimdas_private *devpriv = dev->private;

	int i;

	int chan = CR_CHAN(insn->chanspec);
@@ -397,6 +391,7 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device *dev, 
			       struct comedi_subdevice *s,

			       struct comedi_insn *insn, unsigned int *data)

{

	struct cb_pcimdas_private *devpriv = dev->private;

	int i;

	int chan = CR_CHAN(insn->chanspec);