From b34e3ca28eeb20f6fc8191b0e7a0cf7466d08157 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 18 Jun 2013 12:14:55 -0700 Subject: [PATCH] staging: comedi: addi-data: remove unused vars from boardinfo Due to the on-going cleanup of the addi-data drivers, the boardinfo used in the "common" code has a number of variables that are not used. Remove the cruft. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- .../comedi/drivers/addi-data/addi_common.c | 6 ------ .../comedi/drivers/addi-data/addi_common.h | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 49fb88614b58..d6a91dbd7f62 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -196,8 +196,6 @@ static int addi_auto_attach(struct comedi_device *dev, s->maxdata = devpriv->s_EeParameters.i_AoMaxdata; s->len_chanlist = devpriv->s_EeParameters.i_NbrAoChannel; - s->range_table = this_board->pr_AoRangelist; - s->insn_config = this_board->ao_config; s->insn_write = this_board->ao_write; } else { s->type = COMEDI_SUBD_UNUSED; @@ -271,10 +269,6 @@ static int addi_auto_attach(struct comedi_device *dev, s->io_bits = 0; /* all bits input */ s->len_chanlist = this_board->i_NbrTTLChannel; s->range_table = &range_digital; - s->insn_config = this_board->ttl_config; - s->insn_bits = this_board->ttl_bits; - s->insn_read = this_board->ttl_read; - s->insn_write = this_board->ttl_write; } else { s->type = COMEDI_SUBD_UNUSED; } diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 14726567b1e8..b241ef3a7bfd 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -49,7 +49,6 @@ struct addi_board { int i_AiMaxdata; /* resolution of A/D */ int i_AoMaxdata; /* resolution of D/A */ const struct comedi_lrange *pr_AiRangelist; /* rangelist for A/D */ - const struct comedi_lrange *pr_AoRangelist; /* rangelist for D/A */ int i_NbrDiChannel; /* Number of DI channels */ int i_NbrDoChannel; /* Number of DO channels */ @@ -59,7 +58,6 @@ struct addi_board { int i_Dma; /* dma present or not */ int i_Timer; /* timer subdevice present or not */ - unsigned char b_AvailableConvertUnit; unsigned int ui_MinAcquisitiontimeNs; /* Minimum Acquisition in Nano secs */ unsigned int ui_MinDelaytimeNs; /* Minimum Delay in Nano secs */ @@ -84,12 +82,8 @@ struct addi_board { int (*ai_cancel)(struct comedi_device *, struct comedi_subdevice *); /* Analog Output */ - int (*ao_config)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); int (*ao_write)(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*ao_bits)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); /* Digital Input */ int (*di_config)(struct comedi_device *, struct comedi_subdevice *, @@ -120,16 +114,6 @@ struct addi_board { struct comedi_insn *, unsigned int *); int (*timer_bits)(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - - /* TTL IO */ - int (*ttl_config)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); - int (*ttl_bits)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); - int (*ttl_read)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); - int (*ttl_write)(struct comedi_device *, struct comedi_subdevice *, - struct comedi_insn *, unsigned int *); }; /* MODULE INFO STRUCTURE */