svn commit: r306770 - in stable/11/sys: dev/cxgbe net sys x86/iommu

[John Baldwin]

Author: jhb
Date: Thu Oct  6 17:21:19 2016
New Revision: 306770
URL: https://svnweb.freebsd.org/changeset/base/306770

Log:
  MFC 303754: Add __printflike() to bus_describe_intr() to enable -Wformat checks.
  
  Fix a few places that were passing a raw string as the format to use
  a "%s" format string instead.

Modified:
  stable/11/sys/dev/cxgbe/t4_main.c
  stable/11/sys/net/iflib.c
  stable/11/sys/sys/bus.h
  stable/11/sys/x86/iommu/intel_drv.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_main.c	Thu Oct  6 16:28:34 2016	(r306769)
+++ stable/11/sys/dev/cxgbe/t4_main.c	Thu Oct  6 17:21:19 2016	(r306770)
@@ -4388,7 +4388,7 @@ t4_alloc_irq(struct adapter *sc, struct 
 		    "failed to setup interrupt for rid %d, name %s: %d\n",
 		    rid, name, rc);
 	} else if (name)
-		bus_describe_intr(sc->dev, irq->res, irq->tag, name);
+		bus_describe_intr(sc->dev, irq->res, irq->tag, "%s", name);
 
 	return (rc);
 }

Modified: stable/11/sys/net/iflib.c
==============================================================================
--- stable/11/sys/net/iflib.c	Thu Oct  6 16:28:34 2016	(r306769)
+++ stable/11/sys/net/iflib.c	Thu Oct  6 17:21:19 2016	(r306770)
@@ -1216,7 +1216,7 @@ _iflib_irq_alloc(if_ctx_t ctx, if_irq_t 
 					  rid, name ? name : "unknown", rc);
 		return (rc);
 	} else if (name)
-		bus_describe_intr(dev, res, tag, name);
+		bus_describe_intr(dev, res, tag, "%s", name);
 
 	irq->ii_tag = tag;
 	return (0);

Modified: stable/11/sys/sys/bus.h
==============================================================================
--- stable/11/sys/sys/bus.h	Thu Oct  6 16:28:34 2016	(r306769)
+++ stable/11/sys/sys/bus.h	Thu Oct  6 17:21:19 2016	(r306770)
@@ -538,7 +538,7 @@ int	bus_setup_intr(device_t dev, struct 
 int	bus_teardown_intr(device_t dev, struct resource *r, void *cookie);
 int	bus_bind_intr(device_t dev, struct resource *r, int cpu);
 int	bus_describe_intr(device_t dev, struct resource *irq, void *cookie,
-			  const char *fmt, ...);
+			  const char *fmt, ...) __printflike(4, 5);
 int	bus_set_resource(device_t dev, int type, int rid,
 			 rman_res_t start, rman_res_t count);
 int	bus_get_resource(device_t dev, int type, int rid,

Modified: stable/11/sys/x86/iommu/intel_drv.c
==============================================================================
--- stable/11/sys/x86/iommu/intel_drv.c	Thu Oct  6 16:28:34 2016	(r306769)
+++ stable/11/sys/x86/iommu/intel_drv.c	Thu Oct  6 17:21:19 2016	(r306770)
@@ -306,7 +306,7 @@ dmar_alloc_irq(device_t dev, struct dmar
 		    dmd->name, error);
 		goto err4;
 	}
-	bus_describe_intr(dev, dmd->irq_res, dmd->intr_handle, dmd->name);
+	bus_describe_intr(dev, dmd->irq_res, dmd->intr_handle, "%s", dmd->name);
 	error = PCIB_MAP_MSI(pcib, dev, dmd->irq, &msi_addr, &msi_data);
 	if (error != 0) {
 		device_printf(dev, "cannot map %s interrupt, %d\n",