From 17a39a01e93e1aaab85c3cfc3c8e362e9a04ffcb Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 10 Sep 2002 06:37:02 +0000 Subject: [PATCH] Remove more bogus reprobe code. I don't think it is needed here either. --- sys/dev/cardbus/cardbus.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 43b08587328..c0f0c348e33 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -320,18 +320,6 @@ cardbus_driver_added(device_t cbdev, driver_t *driver) device_get_children(cbdev, &devlist, &numdevs); - cardattached = 0; - for (tmp = 0; tmp < numdevs; tmp++) { - if (device_get_state(devlist[tmp]) != DS_NOTPRESENT) - cardattached++; - } - - if (cardattached == 0) { - free(devlist, M_TEMP); - CARD_REPROBE_CARD(device_get_parent(cbdev), cbdev); - return; - } - DEVICE_IDENTIFY(driver, cbdev); for (tmp = 0; tmp < numdevs; tmp++) { if (device_get_state(devlist[tmp]) == DS_NOTPRESENT) { @@ -342,8 +330,7 @@ cardbus_driver_added(device_t cbdev, driver_t *driver) cardbus_do_cis(cbdev, dinfo->pci.cfg.dev); if (device_probe_and_attach(dinfo->pci.cfg.dev) != 0) { cardbus_release_all_resources(cbdev, dinfo); - } else - cardattached++; + } } }