From: Ian Abbott Date: Tue, 9 Sep 2014 10:26:11 +0000 (+0100) Subject: staging: comedi: addi_eeprom: replace comedi_board() calls X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=664fce451e53ba521cbec59d36000dd1b5116ba6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: comedi: addi_eeprom: replace comedi_board() calls The `comedi_board(dev)` inline function calls just return `dev->board_ptr`. Expand the inline function calls. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index aafc172f3a98..b731856c27da 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -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;