]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: remove this_board macro in the serial2002 driver
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 23 May 2012 01:04:18 +0000 (18:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Jun 2012 03:30:01 +0000 (20:30 -0700)
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>
drivers/staging/comedi/drivers/serial2002.c

index 6342bc5ddb3e4fe6bc654c3e90a925b1273de720..9200310dce5dd408a19f14d9f18c8df5f181b6aa 100644 (file)
@@ -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... */
@@ -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;