git: dbdbbc6ec6b6 - stable/12 - Add/update deprecation version for drivers removed in main

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=dbdbbc6ec6b671c3e83e209cad14f4ec8c58f653

commit dbdbbc6ec6b671c3e83e209cad14f4ec8c58f653
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2020-04-18 02:52:59 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-11-25 17:03:25 +0000

    Add/update deprecation version for drivers removed in main
    
    Add deprecation notices indicating that the amr, esp, iir, mly and twa
    drivers happened before FreeBSD 14.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit dd6382d1c454ab329405b64155dcdf334369a016)
    (cherry picked from commit 5b18755735f964e02e22e0a223dfe935f7e06f4b)
    (cherry picked from commit 6ccdbb521a65e2a0c82920eda9499ccf76896592)
    (cherry picked from commit a32311eccd93bcb0f6fb3f53a426e6918fec3c5b)
    (cherry picked from commit 5c68be59c8f5dbbddabc4c1144be8be6bfd30464)
    (cherry picked from commit c433c96d865e49db8bba63f27ee692ce0e752546)
---
 share/man/man4/amr.4         | 5 +++++
 share/man/man4/esp.4         | 7 ++++++-
 share/man/man4/iir.4         | 5 +++++
 share/man/man4/mly.4         | 5 +++++
 share/man/man4/twa.4         | 5 +++++
 sys/dev/amr/amr_pci.c        | 2 ++
 sys/dev/esp/ncr53c9x.c       | 1 +
 sys/dev/iir/iir_pci.c        | 1 +
 sys/dev/mly/mly.c            | 2 ++
 sys/dev/twa/tw_osl_freebsd.c | 1 +
 10 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/share/man/man4/amr.4 b/share/man/man4/amr.4
index 1a38ee98cad8..145ab0251e8a 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -45,6 +45,11 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 amr_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index 74676f8f03f9..2bbc12c31329 100644
--- a/share/man/man4/esp.4
+++ b/share/man/man4/esp.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 1, 2011
+.Dd March 10, 2020
 .Dt ESP 4
 .Os
 .Sh NAME
@@ -45,6 +45,11 @@ following line in
 .Bd -literal -offset indent
 if_esp_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index d9e4309771cd..eba9b88eb50c 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -8,6 +8,11 @@
 .Sh NAME
 .Nm iir
 .Nd Intel Integrated RAID controller and ICP Vortex driver
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 0a701762d415..f96844113542 100644
--- a/share/man/man4/mly.4
+++ b/share/man/man4/mly.4
@@ -47,6 +47,11 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 mly_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index dbafe91885cc..bdc3935d8079 100644
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
@@ -31,6 +31,11 @@
 .Sh NAME
 .Nm twa
 .Nd 3ware 9000/9500/9550/9650 series SATA RAID controllers driver
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 14.0 .
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 25b37eda3895..11941768d879 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -341,6 +341,8 @@ amr_pci_attach(device_t dev)
 out:
     if (error)
 	amr_pci_free(sc);
+    else
+	gone_in_dev(dev, 14, "amr(4) driver");
     return(error);
 }
 
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 98d40ce70697..6068497ce76b 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -402,6 +402,7 @@ ncr53c9x_attach(struct ncr53c9x_softc *sc)
 
 	NCR_UNLOCK(sc);
 
+	gone_in_dev(sc->sc_dev, 14, "esp(4) driver");
 	return (0);
 
 fail_async:
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index bd7f15b57c4a..51ed27584a93 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -336,6 +336,7 @@ iir_pci_attach(device_t dev)
     }
 
     gdt_pci_enable_intr(gdt);
+    gone_in_dev(dev, 14, "iir(4) removed");
     return (0);
     
 err:
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 359692840f5f..7f2ef792006c 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -336,6 +336,8 @@ mly_attach(device_t dev)
  out:
     if (error != 0)
 	mly_free(sc);
+    else
+	gone_in_dev(dev, 14, "mly(4) removed");
     return(error);
 }
 
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index 0b3e7933a90a..4f4fb7b06de4 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -428,6 +428,7 @@ twa_attach(device_t dev)
 	callout_init(&(sc->watchdog_callout[0]), 1);
 	callout_init(&(sc->watchdog_callout[1]), 1);
 	callout_reset(&(sc->watchdog_callout[0]), 5*hz, twa_watchdog, &sc->ctlr_handle);
+	gone_in_dev(dev, 14, "twa(4) removed");
 
 	return(0);
 }