From e75560c3c36a22d506f2582b8bf458f735e1b1db Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 13 Mar 2013 12:18:12 -0700 Subject: [PATCH] --- yaml --- r: 363447 b: refs/heads/master c: 0b33e43ab39b0080fca9c2cfab58e60af0dd4971 h: refs/heads/master i: 363445: 101b24041dc0cd9417897fe7b1390c7e95ddfb2b 363443: abff0d8cd1846c57f2ac8c209598778d8f6d4371 363439: d59e106c52cd43a7fe19cadfe670d3a3533ff3ed v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi_apci_1710.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index ca2dc1182038..014cbe309691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 818f569fe930c5b8a05d1a44ece3c63c99c13c88 +refs/heads/master: 0b33e43ab39b0080fca9c2cfab58e60af0dd4971 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c index f36ad00cee4a..3640c50f2cb0 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c @@ -45,16 +45,7 @@ static int apci1710_auto_attach(struct comedi_device *dev, ret = comedi_pci_enable(dev); if (ret) return ret; - - 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); - devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3); + devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2); if (pcidev->irq > 0) { ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED, @@ -65,8 +56,6 @@ static int apci1710_auto_attach(struct comedi_device *dev, i_ADDI_AttachPCI1710(dev); - devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2); - i_APCI1710_Reset(dev); return 0; }