From 5b1ccca7276d49daa3546dabebc5cdbb63c8d21d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 14 Oct 2014 10:44:18 -0700 Subject: [PATCH] staging: comedi: addi_common.c: remove i_ADDI_Reset() The addi_apci_035 and addi_apci_1500 are the only drivers left that use this function in addi_common.c. The function simply calls the 'reset' function that is in the boardinfo of the driver. Both drivers use the same 'reset' function for all boardnfo entries. Remove the i_ADDI_Reset() function as well as the 'reset' boardinfo and just call the 'reset' function directly. The i_ADDI_Reset() is called by addi_auto_attach() in addi_common.c after a sucessful attach. Modify the (*auto_attach) in the drivers to call the 'reset' function directly and remove it from addi_auto_attach(). Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- .../staging/comedi/drivers/addi-data/addi_common.c | 9 --------- drivers/staging/comedi/drivers/addi_apci_035.c | 13 ++++++++++--- drivers/staging/comedi/drivers/addi_apci_1500.c | 13 ++++++++++--- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 51574a8d027a..d0bd8127d52c 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -65,14 +65,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d) return IRQ_RETVAL(1); } -static int i_ADDI_Reset(struct comedi_device *dev) -{ - const struct addi_board *this_board = dev->board_ptr; - - this_board->reset(dev); - return 0; -} - static int addi_auto_attach(struct comedi_device *dev, unsigned long context_unused) { @@ -262,6 +254,5 @@ static int addi_auto_attach(struct comedi_device *dev, s->type = COMEDI_SUBD_UNUSED; } - i_ADDI_Reset(dev); return 0; } diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c index b06fde1d6c39..dd28adb00e3d 100644 --- a/drivers/staging/comedi/drivers/addi_apci_035.c +++ b/drivers/staging/comedi/drivers/addi_apci_035.c @@ -28,7 +28,6 @@ static const struct addi_board apci035_boardtypes[] = { .ui_MinAcquisitiontimeNs = 10000, .ui_MinDelaytimeNs = 100000, .interrupt = apci035_interrupt, - .reset = apci035_reset, .ai_config = apci035_ai_config, .ai_read = apci035_ai_read, .timer_config = apci035_timer_config, @@ -40,15 +39,23 @@ static const struct addi_board apci035_boardtypes[] = { static int apci035_auto_attach(struct comedi_device *dev, unsigned long context) { + int ret; + dev->board_ptr = &apci035_boardtypes[0]; - return addi_auto_attach(dev, context); + ret = addi_auto_attach(dev, context); + if (ret) + return ret; + + apci035_reset(dev); + + return 0; } static void apci035_detach(struct comedi_device *dev) { if (dev->iobase) - i_ADDI_Reset(dev); + apci035_reset(dev); comedi_pci_detach(dev); } diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 50a147fc38bf..d4b42618859e 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1500.c +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c @@ -21,7 +21,6 @@ static const struct addi_board apci1500_boardtypes[] = { .i_DoMaxdata = 0xffff, .i_Timer = 1, .interrupt = apci1500_interrupt, - .reset = apci1500_reset, .di_config = apci1500_di_config, .di_read = apci1500_di_read, .di_write = apci1500_di_write, @@ -39,15 +38,23 @@ static const struct addi_board apci1500_boardtypes[] = { static int apci1500_auto_attach(struct comedi_device *dev, unsigned long context) { + int ret; + dev->board_ptr = &apci1500_boardtypes[0]; - return addi_auto_attach(dev, context); + ret = addi_auto_attach(dev, context); + if (ret) + return ret; + + apci1500_reset(dev); + + return 0; } static void apci1500_detach(struct comedi_device *dev) { if (dev->iobase) - i_ADDI_Reset(dev); + apci1500_reset(dev); comedi_pci_detach(dev); } -- 2.30.2