Skip to content

Commit

Permalink
staging: comedi: rtd520: remove thisboard macro
Browse files Browse the repository at this point in the history
The macro 'thisboard' relies on a local variable having a specific
name and yeilds a pointer derived from that local variable. Replace
the macro with a local variable where used and use the comedi_board()
helper to get the 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 16, 2012
1 parent f782a25 commit 9e81c87
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,6 @@ static const struct rtdBoard rtd520Boards[] = {
},
};

/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const struct rtdBoard *)dev->board_ptr)

/*
This structure is for data unique to this hardware driver.
This is also unique for each board in the system.
Expand Down Expand Up @@ -447,6 +442,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode)
static unsigned short rtdConvertChanGain(struct comedi_device *dev,
unsigned int comediChan, int chanIndex)
{ /* index in channel list */
const struct rtdBoard *thisboard = comedi_board(dev);
struct rtdPrivate *devpriv = dev->private;
unsigned int chan, range, aref;
unsigned short r = 0;
Expand Down Expand Up @@ -1611,6 +1607,7 @@ static int rtd_dio_insn_config(struct comedi_device *dev,

static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ /* board name and options flags */
const struct rtdBoard *thisboard;
struct rtdPrivate *devpriv;
struct comedi_subdevice *s;
struct pci_dev *pcidev;
Expand Down Expand Up @@ -1671,6 +1668,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO;
}
devpriv->pci_dev = pcidev;
thisboard = comedi_board(dev);
dev->board_name = thisboard->name;

ret = comedi_pci_enable(pcidev, DRV_NAME);
Expand Down

0 comments on commit 9e81c87

Please sign in to comment.