From 245009060517202788fc1dbf8a5d426cd61262e2 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 7 Feb 2002 06:43:02 +0000 Subject: Get rid of the bogus DETACH_NOWARN and don't warn when asked to detach a card that isn't there unless we're booting verbose. It serves no purpose. --- sys/dev/cardbus/cardbus.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 4fae016..c6a30e5 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -208,7 +208,7 @@ cardbus_attach_card(device_t cbdev) static int curr_bus_number = 2; /* XXX EVILE BAD (see below) */ int bus, slot, func; - cardbus_detach_card(cbdev, DETACH_NOWARN); /* detach existing cards */ + cardbus_detach_card(cbdev, 0); /* detach existing cards */ POWER_ENABLE_SOCKET(brdev, cbdev); bus = pcib_get_bus(cbdev); @@ -272,10 +272,9 @@ cardbus_detach_card(device_t cbdev, int flags) device_get_children(cbdev, &devlist, &numdevs); if (numdevs == 0) { - if (!(flags & DETACH_NOWARN)) { + if (bootverbose) DEVPRINTF((cbdev, "detach_card: no card to detach!\n")); - POWER_DISABLE_SOCKET(device_get_parent(cbdev), cbdev); - } + POWER_DISABLE_SOCKET(device_get_parent(cbdev), cbdev); free(devlist, M_TEMP); return ENOENT; } -- cgit v1.1