staging: comedi: remove thisboard macro in the ssv_dnp driver

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>

diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index 16c4f5a757bb526659b5771745d559675f824cf4..de580958e32ab2123a34683ab599364dd9b0df3d 100644 (file)
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -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 {
 
@@ -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.                          */