Better name for this routine... it doesn't reset the card, but resets

the power to the card...
This commit is contained in:
Warner Losh
2009-03-12 06:25:30 +00:00
parent 449c70725e
commit bca6fb928e
+4 -4
View File
@@ -158,7 +158,7 @@ SYSCTL_ULONG(_hw_cbb, OID_AUTO, debug, CTLFLAG_RW, &cbb_debug, 0,
static void cbb_insert(struct cbb_softc *sc);
static void cbb_removal(struct cbb_softc *sc);
static uint32_t cbb_detect_voltage(device_t brdev);
static void cbb_cardbus_reset(device_t brdev, device_t child, int on);
static void cbb_cardbus_reset_power(device_t brdev, device_t child, int on);
static int cbb_cardbus_io_open(device_t brdev, int win, uint32_t start,
uint32_t end);
static int cbb_cardbus_mem_open(device_t brdev, int win,
@@ -943,7 +943,7 @@ cbb_do_power(device_t brdev)
/************************************************************************/
static void
cbb_cardbus_reset(device_t brdev, device_t child, int on)
cbb_cardbus_reset_power(device_t brdev, device_t child, int on)
{
struct cbb_softc *sc = device_get_softc(brdev);
uint32_t b;
@@ -1003,7 +1003,7 @@ cbb_cardbus_power_enable_socket(device_t brdev, device_t child)
err = cbb_do_power(brdev);
if (err)
return (err);
cbb_cardbus_reset(brdev, child, 1);
cbb_cardbus_reset_power(brdev, child, 1);
return (0);
}
@@ -1011,7 +1011,7 @@ static int
cbb_cardbus_power_disable_socket(device_t brdev, device_t child)
{
cbb_power(brdev, CARD_OFF);
cbb_cardbus_reset(brdev, child, 0);
cbb_cardbus_reset_power(brdev, child, 0);
return (0);
}