aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/pccard
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2002-11-02 23:00:28 +0000
committerWarner Losh <imp@FreeBSD.org>2002-11-02 23:00:28 +0000
commitbcaa6b05410ea742d2b130720e7a07f3d420c4a4 (patch)
tree046b8dea6a0aac813e511aa6c7d3ea6b37bb59d8 /sys/dev/pccard
parent151113a94608e94d67c084755234a2bc27d783c1 (diff)
Notes
Diffstat (limited to 'sys/dev/pccard')
-rw-r--r--sys/dev/pccard/card_if.m5
-rw-r--r--sys/dev/pccard/pccard.c8
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 176249f45815d..f2467514f5409 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -90,11 +90,6 @@ METHOD int attach_card {
#
METHOD int detach_card {
device_t dev;
- int flags;
-}
-
-HEADER {
- #define DETACH_FORCE 0x01
}
#
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index e8747742f1dd3..338c039ebdf97 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -83,7 +83,7 @@ SYSCTL_INT(_hw_pccard, OID_AUTO, cis_debug, CTLFLAG_RW,
static int pccard_ccr_read(struct pccard_function *pf, int ccr);
static void pccard_ccr_write(struct pccard_function *pf, int ccr, int val);
static int pccard_attach_card(device_t dev);
-static int pccard_detach_card(device_t dev, int flags);
+static int pccard_detach_card(device_t dev);
static int pccard_card_gettype(device_t dev, int *type);
static void pccard_function_init(struct pccard_function *pf);
static void pccard_function_free(struct pccard_function *pf);
@@ -259,7 +259,7 @@ pccard_attach_card(device_t dev)
}
static int
-pccard_detach_card(device_t dev, int flags)
+pccard_detach_card(device_t dev)
{
struct pccard_softc *sc = PCCARD_SOFTC(dev);
struct pccard_function *pf;
@@ -776,14 +776,14 @@ pccard_attach(device_t dev)
static int
pccard_detach(device_t dev)
{
- pccard_detach_card(dev, 0);
+ pccard_detach_card(dev);
return 0;
}
static int
pccard_suspend(device_t self)
{
- pccard_detach_card(self, 0);
+ pccard_detach_card(self);
return (0);
}