提交 9e81c876 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: rtd520: remove thisboard macro

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: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 f782a255
...@@ -327,11 +327,6 @@ static const struct rtdBoard rtd520Boards[] = { ...@@ -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 structure is for data unique to this hardware driver.
This is also unique for each board in the system. This is also unique for each board in the system.
...@@ -447,6 +442,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode) ...@@ -447,6 +442,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode)
static unsigned short rtdConvertChanGain(struct comedi_device *dev, static unsigned short rtdConvertChanGain(struct comedi_device *dev,
unsigned int comediChan, int chanIndex) unsigned int comediChan, int chanIndex)
{ /* index in channel list */ { /* index in channel list */
const struct rtdBoard *thisboard = comedi_board(dev);
struct rtdPrivate *devpriv = dev->private; struct rtdPrivate *devpriv = dev->private;
unsigned int chan, range, aref; unsigned int chan, range, aref;
unsigned short r = 0; unsigned short r = 0;
...@@ -1611,6 +1607,7 @@ static int rtd_dio_insn_config(struct comedi_device *dev, ...@@ -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) static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ /* board name and options flags */ { /* board name and options flags */
const struct rtdBoard *thisboard;
struct rtdPrivate *devpriv; struct rtdPrivate *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
struct pci_dev *pcidev; struct pci_dev *pcidev;
...@@ -1671,6 +1668,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1671,6 +1668,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO; return -EIO;
} }
devpriv->pci_dev = pcidev; devpriv->pci_dev = pcidev;
thisboard = comedi_board(dev);
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
ret = comedi_pci_enable(pcidev, DRV_NAME); ret = comedi_pci_enable(pcidev, DRV_NAME);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册