From owner-svn-src-head@freebsd.org Thu Aug 4 18:29:17 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B34FFBAE8E4; Thu, 4 Aug 2016 18:29:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 765241EC8; Thu, 4 Aug 2016 18:29:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74ITGUR052250; Thu, 4 Aug 2016 18:29:16 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74ITGIb052246; Thu, 4 Aug 2016 18:29:16 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201608041829.u74ITGIb052246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 4 Aug 2016 18:29:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303754 - in head/sys: dev/cxgbe net sys x86/iommu X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 18:29:17 -0000 Author: jhb Date: Thu Aug 4 18:29:16 2016 New Revision: 303754 URL: https://svnweb.freebsd.org/changeset/base/303754 Log: 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. MFC after: 2 months Modified: head/sys/dev/cxgbe/t4_main.c head/sys/net/iflib.c head/sys/sys/bus.h head/sys/x86/iommu/intel_drv.c Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Thu Aug 4 17:55:23 2016 (r303753) +++ head/sys/dev/cxgbe/t4_main.c Thu Aug 4 18:29:16 2016 (r303754) @@ -4364,7 +4364,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: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Thu Aug 4 17:55:23 2016 (r303753) +++ head/sys/net/iflib.c Thu Aug 4 18:29:16 2016 (r303754) @@ -1210,7 +1210,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: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Thu Aug 4 17:55:23 2016 (r303753) +++ head/sys/sys/bus.h Thu Aug 4 18:29:16 2016 (r303754) @@ -534,7 +534,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: head/sys/x86/iommu/intel_drv.c ============================================================================== --- head/sys/x86/iommu/intel_drv.c Thu Aug 4 17:55:23 2016 (r303753) +++ head/sys/x86/iommu/intel_drv.c Thu Aug 4 18:29:16 2016 (r303754) @@ -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",