staging: comedi: remove this_board macro in the acl7225b driver

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>

diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index 4e4fc418655f49f4e888fab1f48556dcc9db08c3..c1963add660d494368e3d37d4d5623566c67a586 100644 (file)
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -27,8 +27,6 @@ struct boardtype {
        int io_range;           /*  len of I/O space */
 };
 
-#define this_board ((const struct boardtype *)dev->board_ptr)
-
 static int acl7225b_do_insn(struct comedi_device *dev,
                            struct comedi_subdevice *s,
                            struct comedi_insn *insn, unsigned int *data)
@@ -67,19 +65,20 @@ static int acl7225b_di_insn(struct comedi_device *dev,
 static int acl7225b_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
+       const struct boardtype *board = comedi_board(dev);
        struct comedi_subdevice *s;
        int iobase, iorange;
 
        iobase = it->options[0];
-       iorange = this_board->io_range;
+       iorange = board->io_range;
        printk(KERN_INFO "comedi%d: acl7225b: board=%s 0x%04x\n", dev->minor,
-              this_board->name, iobase);
+              board->name, iobase);
        if (!request_region(iobase, iorange, "acl7225b")) {
                printk(KERN_ERR "comedi%d: request_region failed - I/O port conflict\n",
                        dev->minor);
                return -EIO;
        }
-       dev->board_name = this_board->name;
+       dev->board_name = board->name;
        dev->iobase = iobase;
        dev->irq = 0;
 
@@ -121,8 +120,10 @@ static int acl7225b_attach(struct comedi_device *dev,
 
 static void acl7225b_detach(struct comedi_device *dev)
 {
+       const struct boardtype *board = comedi_board(dev);
+
        if (dev->iobase)
-               release_region(dev->iobase, this_board->io_range);
+               release_region(dev->iobase, board->io_range);
 }
 
 static const struct boardtype boardtypes[] = {