diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-05 10:19:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-11 10:03:34 -0700 |
| commit | 715988871f82a00b8bb36b7f2fdbd865c09b170e (patch) | |
| tree | e5f21118b43e999b45067039e25cf614dd321931 /drivers/staging | |
| parent | e69e860ef2f05df0f8f31854f8b353b9a52e85e7 (diff) | |
| download | linux-715988871f82a00b8bb36b7f2fdbd865c09b170e.tar.bz2 | |
staging: comedi: ni_pcidio: remove this_board macro
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 01da281e32e6..50e025b07780 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -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; |