mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Add __printflike() to bus_describe_intr() to enable -Wformat checks.

Browse Source 
Fix a few places that were passing a raw string as the format to use
a "%s" format string instead.

MFC after:	2 months
This commit is contained in:
John Baldwin 2016-08-04 18:29:16 +00:00
parent ad1d96ca7a
commit f454e7ebf5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=303754
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/cxgbe/t4_main.c
View File

@ -4364,7 +4364,7 @@ t4_alloc_irq(struct adapter *sc, struct irq *irq, int rid,
"failed to setup interrupt for rid %d, name %s: %d\n", "failed to setup interrupt for rid %d, name %s: %d\n",
rid, name, rc); rid, name, rc);
} else if (name) } 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); return (rc);
} }

2
sys/net/iflib.c
View File

@ -1210,7 +1210,7 @@ _iflib_irq_alloc(if_ctx_t ctx, if_irq_t irq, int rid,
rid, name ? name : "unknown", rc); rid, name ? name : "unknown", rc);
return (rc); return (rc);
} else if (name) } else if (name)
bus_describe_intr(dev, res, tag, name); bus_describe_intr(dev, res, tag, "%s", name);
irq->ii_tag = tag; irq->ii_tag = tag;
return (0); return (0);

2
sys/sys/bus.h
View File

@ -534,7 +534,7 @@ int bus_setup_intr(device_t dev, struct resource *r, int flags,
int bus_teardown_intr(device_t dev, struct resource *r, void *cookie); 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_bind_intr(device_t dev, struct resource *r, int cpu);
int bus_describe_intr(device_t dev, struct resource *irq, void *cookie, 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, int bus_set_resource(device_t dev, int type, int rid,
rman_res_t start, rman_res_t count); rman_res_t start, rman_res_t count);
int bus_get_resource(device_t dev, int type, int rid, int bus_get_resource(device_t dev, int type, int rid,

2
sys/x86/iommu/intel_drv.c
View File

@ -306,7 +306,7 @@ dmar_alloc_irq(device_t dev, struct dmar_unit *unit, int idx)
dmd->name, error); dmd->name, error);
goto err4; 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); error = PCIB_MAP_MSI(pcib, dev, dmd->irq, &msi_addr, &msi_data);
if (error != 0) { if (error != 0) {
device_printf(dev, "cannot map %s interrupt, %d\n", device_printf(dev, "cannot map %s interrupt, %d\n",