Skip to content

Commit

Permalink
staging: comedi: remove thisboard macro in the ssv_dnp 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 42caa91 commit ad401db
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions drivers/staging/comedi/drivers/ssv_dnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ struct dnp_board {
int have_dio;
};

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

/* This structure is for data unique to the DNP driver --------------------- */
struct dnp_private_data {

Expand Down Expand Up @@ -188,18 +185,12 @@ static int dnp_dio_insn_config(struct comedi_device *dev,

static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct dnp_board *board = comedi_board(dev);
struct comedi_subdevice *s;

printk(KERN_INFO "comedi%d: dnp: ", dev->minor);

/* Autoprobing: this should find out which board we have. Currently */
/* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* dev->board_ptr = dnp_probe(dev); */

/* Initialize the name of the board. */
/* We can use the "thisboard" macro now. */
dev->board_name = thisboard->name;
dev->board_name = board->name;

/* Allocate the private structure area. alloc_private() is a */
/* convenient macro defined in comedidev.h. */
Expand Down

0 comments on commit ad401db

Please sign in to comment.