leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: cb_pcidio: remove thisboard macro

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-08-16 19:43:55 -07:00 committed by Greg Kroah-Hartman
parent 3b96f250ba
commit 39ffddbb6c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/cb_pcidio.c
View File

@ -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) {