Skip to content

Commit

Permalink
staging: comedi: remove thisboard macro in the pcmda12 driver
Browse files Browse the repository at this point in the history
The 'thisboard' 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 57bbeb3 commit 2fbffee
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/staging/comedi/drivers/pcmda12.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ static const struct comedi_lrange pcmda12_ranges = {
}
};

/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const struct pcmda12_board *)dev->board_ptr)

struct pcmda12_private {

unsigned int ao_readback[CHANS];
Expand Down Expand Up @@ -167,6 +162,7 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
static int pcmda12_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct pcmda12_board *board = comedi_board(dev);
struct comedi_subdevice *s;
unsigned long iobase;

Expand All @@ -181,11 +177,7 @@ static int pcmda12_attach(struct comedi_device *dev,
}
dev->iobase = iobase;

/*
* Initialize dev->board_name. Note that we can use the "thisboard"
* macro now, since we just initialized it in the last line.
*/
dev->board_name = thisboard->name;
dev->board_name = board->name;

/*
* Allocate the private structure area. alloc_private() is a
Expand Down

0 comments on commit 2fbffee

Please sign in to comment.