From be7a5991c4407ffa02d5391367be8a539cbda8a3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 23 Jan 2013 12:39:06 -0700 Subject: [PATCH] --- yaml --- r: 354159 b: refs/heads/master c: d5255afb932aca4d64fedfc791fd1142defdd5dd h: refs/heads/master i: 354157: c21350449afe05423f4aca6c1974d697ffda4bef 354155: 32d2ab6d1d35d4cdec46245e7fb9a7400695f235 354151: 979006434149b80918230b743268b6dce9b437bc 354143: 2e5b46f80ad7ff3ba8b91bb08afffe4c0621adbd v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_3501.c | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 853210e2240f..44f3772dabc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2b82184c9c9a82553bfd49e7940ebc67fe655a8 +refs/heads/master: d5255afb932aca4d64fedfc791fd1142defdd5dd diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c index 3c82596790d5..0c57d70f7fe1 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -173,7 +173,6 @@ static int apci3501_auto_attach(struct comedi_device *dev, struct addi_private *devpriv; struct comedi_subdevice *s; int ret, n_subdevices; - unsigned int dw_Dummy; this_board = addi_find_boardinfo(dev, pcidev); if (!this_board) @@ -224,22 +223,7 @@ static int apci3501_auto_attach(struct comedi_device *dev, dev->irq = pcidev->irq; } - /* Read eepeom and fill addi_board Structure */ - - if (this_board->i_PCIEeprom) { - if (!(strcmp(this_board->pc_EepromChip, "S5920"))) { - /* Set 3 wait stait */ - if (!(strcmp(dev->board_name, "apci035"))) - outl(0x80808082, devpriv->i_IobaseAmcc + 0x60); - else - outl(0x83838383, devpriv->i_IobaseAmcc + 0x60); - - /* Enable the interrupt for the controller */ - dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38); - outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38); - } - addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0)); - } + addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0)); n_subdevices = 7; ret = comedi_alloc_subdevices(dev, n_subdevices);