Remove more deadwood that never got implemented in NEWCARD, since NEWCARD

went a different direction than was anticipated when these compatibility
shims were added.

2 files changed, 0 insertions, 31 deletions

diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 71c07d9..bd003e4 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -94,21 +94,6 @@ METHOD int detach_card {
 }
 
 #
-# Activates (and powers up if necessary) the card's nth function
-# since each function gets its own device, there is no need to
-# to specify a function number
-#
-METHOD int activate_function {
-	device_t  dev;
-	device_t  child;
-}
-
-METHOD int deactivate_function {
-	device_t  dev;
-	device_t  child;
-}
-
-#
 # Compatibility methods for OLDCARD drivers.  We use these routines to make
 # it possible to call the OLDCARD driver's probe routine in the context that
 # it expects.  For OLDCARD these are implemented as pass throughs to the
diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c
index 99b2122..3772ba8 100644
--- a/sys/pccard/pccard_nbk.c
+++ b/sys/pccard/pccard_nbk.c
@@ -381,20 +381,6 @@ pccard_get_memory_offset(device_t bus, device_t child, int rid,
 }
 
 #if __FreeBSD_version >= 500000
-static int
-pccard_activate_function(device_t bus, device_t child)
-{
-	/* pccardd has alrady activated the function */
-	return (0);
-}
-
-static int
-pccard_deactivate_function(device_t bus, device_t child)
-{
-	/* pccardd will deactivate the function */
-	return (0);
-}
-
 static const struct pccard_product *
 pccard_do_product_lookup(device_t bus, device_t dev,
 		      const struct pccard_product *tab,
@@ -432,8 +418,6 @@ static device_method_t pccard_methods[] = {
 	DEVMETHOD(card_set_memory_offset, pccard_set_memory_offset),
  	DEVMETHOD(card_get_memory_offset, pccard_get_memory_offset),
 #if __FreeBSD_version >= 500000
-	DEVMETHOD(card_activate_function, pccard_activate_function),
-	DEVMETHOD(card_deactivate_function, pccard_deactivate_function),
 	DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),
 	DEVMETHOD(card_compat_do_attach, pccard_compat_do_attach),
 	DEVMETHOD(card_do_product_lookup, pccard_do_product_lookup),