From c0c4cd6cb127c369b9db6512eb1ddfbcc9ad27a6 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 1 Nov 2012 11:10:19 -0700 Subject: [PATCH] --- yaml --- r: 337574 b: refs/heads/master c: 06f1b1346fb238befb7ffc5906798d2e035e7648 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_1710.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 0e630eeeafa3..06e870ee7464 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0b5ece1bf94db7113e0e66adedc226aa690e3de +refs/heads/master: 06f1b1346fb238befb7ffc5906798d2e035e7648 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c index a494929b0e54..02a2ac9baaa2 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c @@ -92,23 +92,6 @@ static int apci1710_attach_pci(struct comedi_device *dev, devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2); devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3); - /* Initialize parameters that can be overridden in EEPROM */ - devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel; - devpriv->s_EeParameters.i_NbrAoChannel = this_board->i_NbrAoChannel; - devpriv->s_EeParameters.i_AiMaxdata = this_board->i_AiMaxdata; - devpriv->s_EeParameters.i_AoMaxdata = this_board->i_AoMaxdata; - devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel; - devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel; - devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata; - devpriv->s_EeParameters.i_Dma = this_board->i_Dma; - devpriv->s_EeParameters.i_Timer = this_board->i_Timer; - devpriv->s_EeParameters.ui_MinAcquisitiontimeNs = - this_board->ui_MinAcquisitiontimeNs; - devpriv->s_EeParameters.ui_MinDelaytimeNs = - this_board->ui_MinDelaytimeNs; - - /* ## */ - if (pcidev->irq > 0) { ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED, dev->board_name, dev);