]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: addi_eeprom: replace comedi_board() calls
authorIan Abbott <abbotti@mev.co.uk>
Tue, 9 Sep 2014 10:26:11 +0000 (11:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Sep 2014 21:32:50 +0000 (14:32 -0700)
The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c

index aafc172f3a98e44c8ff17ebb3dda1de5e0790a19..b731856c27da1d6a120d34df8cd8fe04c4ecc6e1 100644 (file)
@@ -179,7 +179,7 @@ static void addi_eeprom_read_di_info(struct comedi_device *dev,
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
@@ -200,7 +200,7 @@ static void addi_eeprom_read_do_info(struct comedi_device *dev,
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
@@ -218,7 +218,7 @@ static void addi_eeprom_read_timer_info(struct comedi_device *dev,
 {
        struct addi_private *devpriv = dev->private;
 #if 0
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        char *type = this_board->pc_EepromChip;
        unsigned short offset = 0;
        unsigned short ntimers;
@@ -259,7 +259,7 @@ static void addi_eeprom_read_ao_info(struct comedi_device *dev,
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
@@ -278,7 +278,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short offset;
@@ -315,7 +315,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
 static void addi_eeprom_read_info(struct comedi_device *dev,
                                  unsigned long iobase)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        char *type = this_board->pc_EepromChip;
        unsigned short size;
        unsigned char nfuncs;