Skip to content

Commit

Permalink
staging: comedi: remove this_board macro in the dt2811 driver
Browse files Browse the repository at this point in the history
The 'this_board' macro depends on having a local variable with
a magic name. The CodingStyle document suggests not doing this
to avoid confusion. Remove the macro and use the comedi_board()
inline helper to get the dev->board_ptr information.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 0613196 commit 5a011d6
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/staging/comedi/drivers/dt2811.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ struct dt2811_board {
const struct comedi_lrange *unip_5;
};

#define this_board ((const struct dt2811_board *)dev->board_ptr)

enum { card_2811_pgh, card_2811_pgl };

struct dt2811_private {
Expand Down Expand Up @@ -404,6 +402,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* unsigned long irqs; */
/* long flags; */

const struct dt2811_board *board = comedi_board(dev);
int ret;
struct comedi_subdevice *s;
unsigned long iobase;
Expand All @@ -418,7 +417,7 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}

dev->iobase = iobase;
dev->board_name = this_board->name;
dev->board_name = board->name;

#if 0
outb(0, dev->iobase + DT2811_ADCSR);
Expand Down Expand Up @@ -527,13 +526,13 @@ static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
switch (it->options[3]) {
case 0:
default:
s->range_table = this_board->bip_5;
s->range_table = board->bip_5;
break;
case 1:
s->range_table = this_board->bip_2_5;
s->range_table = board->bip_2_5;
break;
case 2:
s->range_table = this_board->unip_5;
s->range_table = board->unip_5;
break;
}

Expand Down

0 comments on commit 5a011d6

Please sign in to comment.