From: H Hartley Sweeten Date: Wed, 12 Jun 2013 23:08:14 +0000 (-0700) Subject: staging: comedi: addi_apci_3xxx: boards do not have a timer X-Git-Tag: v3.11-rc1~158^2~149 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=178bd8d3a61432ce24399604b13cc756293d1ac8;p=~emulex%2Finfiniband.git staging: comedi: addi_apci_3xxx: boards do not have a timer None of the boards supported by this driver have a timer. Remove the unnecessary code. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index 909e7b674ae..dfd8f62351a 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -732,7 +732,6 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, devpriv->s_EeParameters.i_NbrDiChannel = board->i_NbrDiChannel; devpriv->s_EeParameters.i_NbrDoChannel = board->i_NbrDoChannel; devpriv->s_EeParameters.i_DoMaxdata = board->i_DoMaxdata; - devpriv->s_EeParameters.i_Timer = board->i_Timer; devpriv->s_EeParameters.ui_MinAcquisitiontimeNs = board->ui_MinAcquisitiontimeNs; devpriv->s_EeParameters.ui_MinDelaytimeNs = board->ui_MinDelaytimeNs; @@ -848,21 +847,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, /* Allocate and Initialise Timer Subdevice Structures */ s = &dev->subdevices[4]; - if (devpriv->s_EeParameters.i_Timer) { - s->type = COMEDI_SUBD_TIMER; - s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = 1; - s->maxdata = 0; - s->len_chanlist = 1; - s->range_table = &range_digital; - - s->insn_write = board->timer_write; - s->insn_read = board->timer_read; - s->insn_config = board->timer_config; - s->insn_bits = board->timer_bits; - } else { - s->type = COMEDI_SUBD_UNUSED; - } + s->type = COMEDI_SUBD_UNUSED; /* Allocate and Initialise TTL */ s = &dev->subdevices[5];