diff options
| author | imp <imp@FreeBSD.org> | 2001-07-27 07:47:35 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-07-27 07:47:35 +0000 |
| commit | 99e02098701c38804a815ecfa8ce48ab4bbb4c4a (patch) | |
| tree | e20143c7284a600a77d852cbf3999798a019896c /sys/pccard/pccard.c | |
| parent | ceb7dfdec7cadfd491953e01ff211c4ef16d9978 (diff) | |
| download | FreeBSD-src-99e02098701c38804a815ecfa8ce48ab4bbb4c4a.zip FreeBSD-src-99e02098701c38804a815ecfa8ce48ab4bbb4c4a.tar.gz | |
Minor nits merged from my stable tree:
o kill blank line that I introduced in cardinfo.h
o Delete unused variable wasinactive.
o return 0 from pccard_resume.
o Set the state and lastsate initially to be empty.
o move comment above code for interrupt dispatching.
o Powerstate interface is now available as of 430002, not 500000 (note that
this change will be not 100% correct since the power state stuff didn't
enter current until well after 500000, but it is good enough for the two
branche we have going now).
Diffstat (limited to 'sys/pccard/pccard.c')
| -rw-r--r-- | sys/pccard/pccard.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 274918d..d8187d6 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -166,8 +166,6 @@ disable_slot(struct slot *slt) static void disable_slot_to(struct slot *slt) { - int wasinactive; - disable_slot(slt); if (slt->state == empty) printf("pccard: card removed, slot %d\n", slt->slotnum); @@ -704,4 +702,5 @@ pccard_resume(device_t dev) struct slot *slt = PCCARD_DEVICE2SOFTC(dev); slt->ctrl->resume(slt); + return (0); } |
