1 files changed, 9 insertions, 35 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 2a0ebce83e7a..89d737ee551a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -140,27 +140,17 @@ struct pci_driver aic7xxx_pci_driver = {
 static void
 ahc_linux_pci_dev_remove(struct pci_dev *pdev)
 {
-        struct ahc_softc *ahc;
-        u_long l;
+        struct ahc_softc *ahc = pci_get_drvdata(pdev);
+        u_long s;
 
-        /*
-         * We should be able to just perform
-         * the free directly, but check our
-         * list for extra sanity.
-         */
-        ahc_list_lock(&l);
-        ahc = ahc_find_softc((struct ahc_softc *)pci_get_drvdata(pdev));
-        if (ahc != NULL) {
-                u_long s;
+        ahc_list_lock(&s);
+        TAILQ_REMOVE(&ahc_tailq, ahc, links);
+        ahc_list_unlock(&s);
 
-                TAILQ_REMOVE(&ahc_tailq, ahc, links);
-                ahc_list_unlock(&l);
-                ahc_lock(ahc, &s);
-                ahc_intr_enable(ahc, FALSE);
-                ahc_unlock(ahc, &s);
-                ahc_free(ahc);
-        } else
-                ahc_list_unlock(&l);
+        ahc_lock(ahc, &s);
+        ahc_intr_enable(ahc, FALSE);
+        ahc_unlock(ahc, &s);
+        ahc_free(ahc);
 }
 
 static int
@@ -174,22 +164,6 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         char            *name;
         int              error;
 
-        /*
-         * Some BIOSen report the same device multiple times.
-         */
-        TAILQ_FOREACH(ahc, &ahc_tailq, links) {
-                struct pci_dev *probed_pdev;
-
-                probed_pdev = ahc->dev_softc;
-                if (probed_pdev->bus->number == pdev->bus->number
-                 && probed_pdev->devfn == pdev->devfn)
-                        break;
-        }
-        if (ahc != NULL) {
-                /* Skip duplicate. */
-                return (-ENODEV);
-        }
-
         pci = pdev;
         entry = ahc_find_pci_device(pci);
         if (entry == NULL)