From 574af93a3f22698b0cbb74411c6ae0009a6b2d6d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 5 Nov 2012 14:36:53 -0700 Subject: [PATCH] --- yaml --- r: 337663 b: refs/heads/master c: 05f22ad7d2c0cc7db70554745bacdddf48452d22 h: refs/heads/master i: 337661: 91b89ed0dffb32dce5a2137f9031d51d35386ee8 337659: 5500b39fd7412ebb07365455a7be7dee1f8f246b 337655: 55542d17e2748a59fba20b454c92852938bf393f 337647: 41dedf23e9db3764df3636e74395edc9e812a65c 337631: beced0457cd912c0d78280f97c5263e359dfd2b0 337599: 3c43b8e66c7d378c08f5144a7f15cd821b7d9b0a 337535: 858a7d952762019fc7c1d2d2df5b116b3da895d8 337407: 3a0a194d55d2aa0f35dc9871d38771cf89062ff7 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_1032.c | 20 ++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 4762a09911e4..e419f448dc20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c2c1488d382ab79ca364e1ce988a21df9627bf5 +refs/heads/master: 05f22ad7d2c0cc7db70554745bacdddf48452d22 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c index 70cada42dd1b..8ea9feac4e27 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c @@ -88,22 +88,10 @@ static int apci1032_attach_pci(struct comedi_device *dev, if (ret) return ret; - if (!this_board->pc_EepromChip || - !strcmp(this_board->pc_EepromChip, 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 { - 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, 2); + devpriv->iobase = pci_resource_start(pcidev, 2); + devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3), + this_board->i_IorangeBase3); devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3); /* Initialize parameters that can be overridden in EEPROM */