staging: comedi: addi_apci_035: remove subdevice callbacks from boardinfo

This driver only has one boardinfo entry so the subdevice callbacks are
always the same. Remvoe the callbacks from the boardinfo and use them
directly when initializing the subdevices.

Remove all the subdevice callback initialization that would be set to
NULL.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index fd7d3f1d720500a5c1225bd16479e75b8ff08a56..c9cd68cc610149d8f27741cee2db94ceb466d55f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -26,11 +26,6 @@ static const struct addi_board apci035_boardtypes[] = {
                .i_Timer                = 1,
                .ui_MinAcquisitiontimeNs = 10000,
                .ui_MinDelaytimeNs      = 100000,
-               .ai_config              = apci035_ai_config,
-               .ai_read                = apci035_ai_read,
-               .timer_config           = apci035_timer_config,
-               .timer_write            = apci035_timer_write,
-               .timer_read             = apci035_timer_read,
        },
 };
 
@@ -142,15 +137,8 @@ static int apci035_auto_attach(struct comedi_device *dev,
                s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
                s->len_chanlist = this_board->i_AiChannelList;
                s->range_table = this_board->pr_AiRangelist;
-
-               s->insn_config = this_board->ai_config;
-               s->insn_read = this_board->ai_read;
-               s->insn_write = this_board->ai_write;
-               s->insn_bits = this_board->ai_bits;
-               s->do_cmdtest = this_board->ai_cmdtest;
-               s->do_cmd = this_board->ai_cmd;
-               s->cancel = this_board->ai_cancel;
-
+               s->insn_config = apci035_ai_config;
+               s->insn_read = apci035_ai_read;
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
@@ -164,7 +152,6 @@ static int apci035_auto_attach(struct comedi_device *dev,
                s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
                s->len_chanlist =
                        devpriv->s_EeParameters.i_NbrAoChannel;
-               s->insn_write = this_board->ao_write;
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
@@ -178,10 +165,6 @@ static int apci035_auto_attach(struct comedi_device *dev,
                s->len_chanlist =
                        devpriv->s_EeParameters.i_NbrDiChannel;
                s->range_table = &range_digital;
-               s->insn_config = this_board->di_config;
-               s->insn_read = this_board->di_read;
-               s->insn_write = this_board->di_write;
-               s->insn_bits = this_board->di_bits;
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
@@ -196,12 +179,6 @@ static int apci035_auto_attach(struct comedi_device *dev,
                s->len_chanlist =
                        devpriv->s_EeParameters.i_NbrDoChannel;
                s->range_table = &range_digital;
-
-               /* insn_config - for digital output memory */
-               s->insn_config = this_board->do_config;
-               s->insn_write = this_board->do_write;
-               s->insn_bits = this_board->do_bits;
-               s->insn_read = this_board->do_read;
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
@@ -215,11 +192,9 @@ static int apci035_auto_attach(struct comedi_device *dev,
                s->maxdata = 0;
                s->len_chanlist = 1;
                s->range_table = &range_digital;
-
-               s->insn_write = this_board->timer_write;
-               s->insn_read = this_board->timer_read;
-               s->insn_config = this_board->timer_config;
-               s->insn_bits = this_board->timer_bits;
+               s->insn_write = apci035_timer_write;
+               s->insn_read = apci035_timer_read;
+               s->insn_config = apci035_timer_config;
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }