Skip to content

Commit

Permalink
staging: comedi: remove this_board macro in the serial2002 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 ad401db commit 609dd34
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/staging/comedi/drivers/serial2002.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ struct serial2002_board {
const char *name;
};

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

struct serial2002_range_table_t {

/* HACK... */
Expand Down Expand Up @@ -783,10 +778,11 @@ static int serial2002_ei_rinsn(struct comedi_device *dev,
static int serial2002_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct serial2002_board *board = comedi_board(dev);
struct comedi_subdevice *s;

dev_dbg(dev->hw_dev, "comedi%d: attached\n", dev->minor);
dev->board_name = thisboard->name;
dev->board_name = board->name;
if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
return -ENOMEM;
dev->open = serial_2002_open;
Expand Down

0 comments on commit 609dd34

Please sign in to comment.