forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_pcidio: remove this_board macro

Browse source 
This macro relies on a local variable having a specific name and
derives a pointer from that local variable.

It's only used in the attach and we already have the local variable
'board' that has the same information. Use that instead.

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 2013-03-05 10:19:36 -07:00 • committed by Greg Kroah-Hartman
commit 715988871f
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/ni_pcidio.c
View file

@ -304,8 +304,6 @@ static const struct nidio_board nidio_boards[] = {
},
};
#define this_board ((const struct nidio_board *)dev->board_ptr)
struct nidio96_private {
struct mite_struct *mite;
int boardtype;
@ -1112,7 +1110,7 @@ static int nidio_auto_attach(struct comedi_device *dev,
if (!board)
return -ENODEV;
dev->board_ptr = board;
dev->board_name = this_board->name;
dev->board_name = board->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
@ -1136,7 +1134,7 @@ static int nidio_auto_attach(struct comedi_device *dev,
return -ENOMEM;
irq = mite_irq(devpriv->mite);
if (this_board->uses_firmware) {
if (board->uses_firmware) {
ret = pci_6534_upload_firmware(dev);
if (ret < 0)
return ret;