svn commit: r327089 - in head/sys: dev/drm2/i915 dev/drm2/radeon dev/ed dev/intpm dev/ioat dev/ntb/ntb_hw net

[Warner Losh]

Author: imp
Date: Fri Dec 22 17:53:27 2017
New Revision: 327089
URL: https://svnweb.freebsd.org/changeset/base/327089

Log:
  Use '#' rather than some made up name for fields we want to ignore.

Modified:
  head/sys/dev/drm2/i915/i915_drv.c
  head/sys/dev/drm2/radeon/radeon_drv.c
  head/sys/dev/ed/if_ed_pci.c
  head/sys/dev/intpm/intpm.c
  head/sys/dev/ioat/ioat.c
  head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
  head/sys/net/iflib.h

Modified: head/sys/dev/drm2/i915/i915_drv.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_drv.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/drm2/i915/i915_drv.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -1236,7 +1236,7 @@ MODULE_DEPEND(i915kms, agp, 1, 1, 1);
 MODULE_DEPEND(i915kms, iicbus, 1, 1, 1);
 MODULE_DEPEND(i915kms, iic, 1, 1, 1);
 MODULE_DEPEND(i915kms, iicbb, 1, 1, 1);
-MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:human", vgapci, i915, pciidlist,
+MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:#", vgapci, i915, pciidlist,
     sizeof(pciidlist[0]), nitems(pciidlist));
 
 /* We give fast paths for the really cool registers */

Modified: head/sys/dev/drm2/radeon/radeon_drv.c
==============================================================================
--- head/sys/dev/drm2/radeon/radeon_drv.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/drm2/radeon/radeon_drv.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -401,5 +401,5 @@ MODULE_DEPEND(radeonkms, iicbus, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iic, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iicbb, 1, 1, 1);
 MODULE_DEPEND(radeonkms, firmware, 1, 1, 1);
-MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:human", vgapci, radeonkms,
+MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:@", vgapci, radeonkms,
     pciidlist, sizeof(pciidlist[0]), nitems(pciidlist));

Modified: head/sys/dev/ed/if_ed_pci.c
==============================================================================
--- head/sys/dev/ed/if_ed_pci.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/ed/if_ed_pci.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -145,6 +145,6 @@ static driver_t ed_pci_driver = {
 DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0);
 MODULE_DEPEND(ed, pci, 1, 1, 1);
 MODULE_DEPEND(ed, ether, 1, 1, 1);
-MODULE_PNP_INFO("W32:vendor/device;D:human", pci, ed, pci_ids, sizeof(pci_ids[0]),
+MODULE_PNP_INFO("W32:vendor/device;D:@", pci, ed, pci_ids, sizeof(pci_ids[0]),
     nitems(pci_ids) - 1);
 

Modified: head/sys/dev/intpm/intpm.c
==============================================================================
--- head/sys/dev/intpm/intpm.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/intpm/intpm.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -895,5 +895,5 @@ DRIVER_MODULE_ORDERED(intsmb, pci, intsmb_driver, ints
 DRIVER_MODULE(smbus, intsmb, smbus_driver, smbus_devclass, 0, 0);
 MODULE_DEPEND(intsmb, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(intsmb, 1);
-MODULE_PNP_INFO("W32:vendor/device;D:human", pci, intpm, intsmb_products,
+MODULE_PNP_INFO("W32:vendor/device;D:#", pci, intpm, intsmb_products,
     sizeof(intsmb_products[0]), nitems(intsmb_products));

Modified: head/sys/dev/ioat/ioat.c
==============================================================================
--- head/sys/dev/ioat/ioat.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/ioat/ioat.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -240,7 +240,7 @@ static struct _pcsid
 	{ 0x20218086, "SKX IOAT" },
 };
 
-MODULE_PNP_INFO("W32:vendor/device;D:human", pci, ioat, pci_ids,
+MODULE_PNP_INFO("W32:vendor/device;D:#", pci, ioat, pci_ids,
     sizeof(pci_ids[0]), nitems(pci_ids));
 
 /*

Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c	Fri Dec 22 17:53:27 2017	(r327089)
@@ -3119,5 +3119,5 @@ static DEFINE_CLASS_0(ntb_hw, ntb_intel_driver, ntb_in
 DRIVER_MODULE(ntb_hw_intel, pci, ntb_intel_driver, ntb_hw_devclass, NULL, NULL);
 MODULE_DEPEND(ntb_hw_intel, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_hw_intel, 1);
-MODULE_PNP_INFO("W32:vendor/device;D:human", pci, ntb_hw_intel, pci_ids,
+MODULE_PNP_INFO("W32:vendor/device;D:@", pci, ntb_hw_intel, pci_ids,
     sizeof(pci_ids[0]), nitems(pci_ids));

Modified: head/sys/net/iflib.h
==============================================================================
--- head/sys/net/iflib.h	Fri Dec 22 17:52:38 2017	(r327088)
+++ head/sys/net/iflib.h	Fri Dec 22 17:53:27 2017	(r327089)
@@ -174,7 +174,7 @@ typedef struct pci_vendor_info {
 #define PVID_END {0, 0, 0, 0, 0, 0, NULL}
 
 #define IFLIB_PNP_DESCR "U32:vendor;U32:device;U32:subvendor;U32:subdevice;" \
-    "U32:revision;U32:class;D:human"
+    "U32:revision;U32:class;D:#"
 #define IFLIB_PNP_INFO(b, u, t) \
     MODULE_PNP_INFO(IFLIB_PNP_DESCR, b, u, t, sizeof(t[0]), nitems(t))