19 files changed, 53 insertions, 5 deletions

diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index dd21376269df..622cdd5efac9 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -51,6 +51,9 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_an_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index c303a5a4233a..d9bce208680f 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -222,6 +222,9 @@ Unknown ATA chipsets are supported in PIO modes, and if the standard
 busmaster DMA registers are present and contain valid setup, DMA is
 also enabled, although the max mode is limited to UDMA33, as it is
 not known what the chipset can do and how to program it.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh NOTES
 Please remember that in order to use UDMA4/ATA66 and above modes you
 .Em must
diff --git a/share/man/man4/cmx.4 b/share/man/man4/cmx.4
index aebcbc09be4d..0600bb2071a4 100644
--- a/share/man/man4/cmx.4
+++ b/share/man/man4/cmx.4
@@ -34,6 +34,9 @@
 .Nd Omnikey CardMan 4040 smartcard reader device driver
 .Sh SYNOPSIS
 .Cd device cmx
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 37e523db6769..c487c8b18bb3 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -313,6 +313,9 @@ Third argument is a pointer to
 This type is the same as being used in the per-drive configuration
 flags, or in the CMOS configuration data or ACPI namespace on IA32 systems.
 .El
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh FILES
 .Bl -tag -width ".Pa /dev/fd*" -compact
 .It Pa /dev/fd*
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 5e1c29485ff3..1531b0ced897 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -120,6 +120,9 @@ driver-specific registry keys to control the media setting
 which can be configured via the
 .Xr sysctl 8
 command.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ndis%d: watchdog timeout"
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index 9cff66bc1599..d3942ea1d7fc 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -34,6 +34,9 @@
 .Sh SYNOPSIS
 .In sys/types.h
 .In netgraph/bluetooth/include/ng_bt3c.h
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm btccc
diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4
index 33d305bcc9dd..e929d46f1b16 100644
--- a/share/man/man4/pccard.4
+++ b/share/man/man4/pccard.4
@@ -33,7 +33,7 @@
 .Cd device pccard
 .Sh DEPRECATION NOTICE
 This driver is scheduled for removal prior to the release of
-.Fx 13.0
+.Fx 13.0 .
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index eb76c36f4aff..effebf188419 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -47,6 +47,9 @@ driver.
 The list of supported devices is in
 .Pa sys/dev/puc/pucdata.c .
 Support for new cards should be added there.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh SEE ALSO
 .Xr ppc 4 ,
 .Xr uart 4
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 2fe7bb4175d5..cce718b790f3 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -271,6 +271,9 @@ be locked for devices that support more than one setting.
 The CLOCAL flag on callin ports should be locked off for logins
 to avoid certain security holes, but this needs to be done by
 getty if the callin port is used for anything else.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh FILES
 .Bl -tag -width "/dev/ttyu?.init" -compact
 .It Pa /dev/ttyu?
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index f2f00f56820e..c3a6a2b713c2 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -52,6 +52,9 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_wi_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 4c9f94350ec9..568e80b5fd53 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -156,5 +156,7 @@ an_pccard_attach(device_t dev)
 fail:
 	if (error)
 		an_release_resources(dev);
+	else
+		gone_in_dev(dev, 13, "pccard removed");
 	return (error);
 }
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 14a47c5f6842..aa688338558c 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -144,6 +144,7 @@ ata_pccard_attach(device_t dev)
     err = ata_probe(dev);
     if (err > 0)
 	return (err);
+    gone_in_dev(dev, 13, "pccard removed");
     return (ata_attach(dev));
 }
 
diff --git a/sys/dev/cmx/cmx_pccard.c b/sys/dev/cmx/cmx_pccard.c
index 43215fd6df94..b7f7a749c82a 100644
--- a/sys/dev/cmx/cmx_pccard.c
+++ b/sys/dev/cmx/cmx_pccard.c
@@ -95,7 +95,7 @@ cmx_pccard_attach(device_t dev)
 		return rv;
 	}
 
-	device_printf(dev, "attached\n");
+	gone_in_dev(dev, 13, "pccard removed");
 	return 0;
 }
 
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index 364e2104b648..7b7f88648884 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -110,9 +110,10 @@ fdc_pccard_attach(device_t dev)
 		device_set_flags(child, 0x24);
 		error = bus_generic_attach(dev);
 	}
-	if (error == 0)
+	if (error == 0) {
+		gone_in_dev(dev, 13, "pccard removed");
 		fdc_start_worker(dev);
-	else
+	} else
 		fdc_release_resources(fdc);
 	return (error);
 }
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index ee4e174ae3ef..aa9735eba1ea 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -303,6 +303,8 @@ ndis_attach_pccard(dev)
 	}
 
 	error = ndis_attach(dev);
+	if (error == 0)
+		gone_in_dev(dev, 13, "pccard removed");
 
 fail:
 	return(error);
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index 6aa115ed583f..1b26b034dfa5 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -73,10 +73,21 @@ puc_pccard_probe(device_t dev)
 	return (ENXIO);
 }
 
+static int
+puc_pccard_attach(device_t dev)
+{
+	int error;
+
+	error = puc_bfe_attach(dev);
+	if (error == 0)
+		gone_in_dev(dev, 13, "pccard removed");
+	return (error);
+}
+
 static device_method_t puc_pccard_methods[] = {
     /* Device interface */
     DEVMETHOD(device_probe,		puc_pccard_probe),
-    DEVMETHOD(device_attach,		puc_bfe_attach),
+    DEVMETHOD(device_attach,		puc_pccard_attach),
     DEVMETHOD(device_detach,		puc_bfe_detach),
 
     DEVMETHOD(bus_alloc_resource,	puc_bus_alloc_resource),
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index 58571b13d66e..210ea1232204 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -98,6 +98,7 @@ uart_pccard_attach(device_t dev)
 	error = uart_bus_probe(dev, 0, 0, 0, 0, 0, 0);
 	if (error > 0)
 		return (error);
+	gone_in_dev(dev, 13, "pccard removed");
 	return (uart_bus_attach(dev));
 }
 
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 22bd0d6f8dfa..f3905bbecfff 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -200,6 +200,7 @@ wi_pccard_attach(device_t dev)
 		error = wi_attach(dev);
 		if (error != 0)
 			wi_free(dev);
+		gone_in_dev(dev, 13, "pccard removed");
 	}
 	return error;
 }
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 7b8c3fbd74a3..5a874e989711 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -677,6 +677,8 @@ bt3c_pccard_attach(device_t dev)
 
 	NG_NODE_SET_PRIVATE(sc->node, sc);
 
+	gone_in_dev(dev, 13, "pccard removed");
+
 	return (0);
 bad:
 	if (sc->ith != NULL) {