From f37511889cf9d8aef6f2876a0cdfc7c2b3089ea7 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 10 Sep 2002 06:32:18 +0000
Subject: [PATCH] o Dike out the bogus reprobe stuff.  It was getting in the
 way of newbus' own   reprobe code working.  This bogusness was thrust upon
 me. o Don't delete the device if no drivers attach.  I had thrust this
 bogusness   upon others.

These two changes make kldload of a pccard driver work again.
---
 sys/dev/pccard/card_if.m | 9 ---------
 sys/dev/pccard/pccard.c  | 7 -------
 2 files changed, 16 deletions(-)

diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index b321d226a04f..176249f45815 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -93,15 +93,6 @@ METHOD int detach_card {
 	int	  flags;
 }
 
-#
-# pccard/cardbus buses call this to request a reprobe of the bus.
-# reprobe only initiated if the child bus is the same type the card inserted.
-#
-METHOD int reprobe_card {
-	device_t  dev;
-	device_t  child;
-}
-
 HEADER {
 	#define DETACH_FORCE 0x01
 }
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index aa42cf2a5b3e..d57e17826108 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -248,8 +248,6 @@ pccard_attach_card(device_t dev)
 				pccard_function_disable(pf);
 		}
 	}
-	if (sc->sc_enabled_count == 0)
-		pccard_detach_card(dev, 0);
 	return (0);
 }
 
@@ -975,11 +973,6 @@ pccard_driver_added(device_t dev, driver_t *driver)
 	struct pccard_function *pf;
 	device_t child;
 
-	if (sc->sc_enabled_count == 0) {
-		CARD_REPROBE_CARD(device_get_parent(dev), dev);
-		return;
-	}
-
 	STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) {
 		if (STAILQ_EMPTY(&pf->cfe_head))
 			continue;