Skip to content

Commit

Permalink
staging: comedi: ni_pcidio: remove this_board macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent e69e860 commit 7159888
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/ni_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit 7159888

Please sign in to comment.