From eae37f1fc983ebf941391fc3f72485046b7aeffb Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 17 Jan 2013 17:38:01 -0700 Subject: [PATCH] --- yaml --- r: 354061 b: refs/heads/master c: a0ba8a299049d3c997b69a7cee23a1432aac9417 h: refs/heads/master i: 354059: 33db63be4117c4e383f703847cac84fc9a0039cc v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_2200.c | 24 ++++--------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 8772726477b1..dcde47555a18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb1e4e2e0b8a5b57ca861b6fc6d9f4af0bbb568e +refs/heads/master: a0ba8a299049d3c997b69a7cee23a1432aac9417 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c index 632013643085..49847ba5d3e9 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c @@ -90,24 +90,10 @@ static int apci2200_auto_attach(struct comedi_device *dev, if (ret) return ret; - if (!this_board->pc_EepromChip || - strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) { - /* board does not have an eeprom or is not ADDIDATA_9054 */ - if (this_board->i_IorangeBase1) - dev->iobase = pci_resource_start(pcidev, 1); - else - dev->iobase = pci_resource_start(pcidev, 0); - - devpriv->iobase = dev->iobase; - devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0); - devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2); - } else { - /* board has an ADDIDATA_9054 eeprom */ - dev->iobase = pci_resource_start(pcidev, 2); - devpriv->iobase = pci_resource_start(pcidev, 2); - devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3), - this_board->i_IorangeBase3); - } + dev->iobase = pci_resource_start(pcidev, 1); + devpriv->iobase = dev->iobase; + devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0); + devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2); devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3); /* Initialize parameters that can be overridden in EEPROM */ @@ -227,8 +213,6 @@ static void apci2200_detach(struct comedi_device *dev) apci2200_reset(dev); if (dev->irq) free_irq(dev->irq, dev); - if (devpriv->dw_AiBase) - iounmap(devpriv->dw_AiBase); } if (pcidev) { if (dev->iobase)