svn commit: r348753 - stable/11/sys/kern

[John Baldwin]

Author: jhb
Date: Thu Jun  6 19:41:05 2019
New Revision: 348753
URL: https://svnweb.freebsd.org/changeset/base/348753

Log:
  MFC 348543: Warn about deprecated features on all major OS versions.
  
  Approved by:	re (gjb)

Modified:
  stable/11/sys/kern/subr_bus.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/subr_bus.c
==============================================================================
--- stable/11/sys/kern/subr_bus.c	Thu Jun  6 19:40:12 2019	(r348752)
+++ stable/11/sys/kern/subr_bus.c	Thu Jun  6 19:41:05 2019	(r348753)
@@ -5742,7 +5742,7 @@ _gone_in(int major, const char *msg)
 	gone_panic(major, P_OSREL_MAJOR(__FreeBSD_version), msg);
 	if (P_OSREL_MAJOR(__FreeBSD_version) >= major)
 		printf("Obsolete code will removed soon: %s\n", msg);
-	else if (P_OSREL_MAJOR(__FreeBSD_version) + 1 == major)
+	else
 		printf("Deprecated code (to be removed in FreeBSD %d): %s\n",
 		    major, msg);
 }
@@ -5755,7 +5755,7 @@ _gone_in_dev(device_t dev, int major, const char *msg)
 	if (P_OSREL_MAJOR(__FreeBSD_version) >= major)
 		device_printf(dev,
 		    "Obsolete code will removed soon: %s\n", msg);
-	else if (P_OSREL_MAJOR(__FreeBSD_version) + 1 == major)
+	else
 		device_printf(dev,
 		    "Deprecated code (to be removed in FreeBSD %d): %s\n",
 		    major, msg);