diff options
| author | H Hartley Sweeten | 2012-08-17 04:43:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-17 17:14:30 +0200 |
| commit | 39ffddbb6c6803590f6150eb889975727acb943c (patch) | |
| tree | 593335fe97a483655559d3d219bb885564abdf02 | |
| parent | staging: comedi: cb_pcidas: use attach_pci callback (diff) | |
| download | kernel-qcow2-linux-39ffddbb6c6803590f6150eb889975727acb943c.tar.gz kernel-qcow2-linux-39ffddbb6c6803590f6150eb889975727acb943c.tar.xz kernel-qcow2-linux-39ffddbb6c6803590f6150eb889975727acb943c.zip | |
staging: comedi: cb_pcidio: remove thisboard macro
This macro relies on a local variable having a specific name.
Remove it 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidio.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c index e370d0d81bbd..c377bebd41c4 100644 --- a/drivers/staging/comedi/drivers/cb_pcidio.c +++ b/drivers/staging/comedi/drivers/cb_pcidio.c @@ -85,11 +85,6 @@ static const struct pcidio_board pcidio_boards[] = { }, }; -/* - * Useful for shorthand access to the particular board structure - */ -#define thisboard ((const struct pcidio_board *)dev->board_ptr) - static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev, struct comedi_devconfig *it) { @@ -122,6 +117,7 @@ static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev, static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + const struct pcidio_board *thisboard; struct pci_dev *pcidev; int i; int ret; @@ -130,11 +126,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (!pcidev) return -EIO; comedi_set_hw_dev(dev, &pcidev->dev); - -/* - * Initialize dev->board_name. Note that we can use the "thisboard" - * macro now, since we just initialized it in the last line. - */ + thisboard = comedi_board(dev); dev->board_name = thisboard->name; if (comedi_pci_enable(pcidev, thisboard->name)) @@ -158,6 +150,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void pcidio_detach(struct comedi_device *dev) { + const struct pcidio_board *thisboard = comedi_board(dev); struct pci_dev *pcidev = comedi_to_pci_dev(dev); if (pcidev) { |