diff options
| author | Warner Losh <imp@FreeBSD.org> | 2009-03-12 06:25:30 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2009-03-12 06:25:30 +0000 |
| commit | bca6fb928e3699bf2847411207d16d5183a7b5f3 (patch) | |
| tree | 88759f24543ff69931605a111227f94b068e2c8e /sys/dev/pccbb | |
| parent | 449c70725e3df4281f3b970d80106b61f96f974c (diff) | |
Notes
Diffstat (limited to 'sys/dev/pccbb')
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index 008aa8a4ee7e..a0585b00b8ea 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -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); } |