From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755589Ab2IZBUD (ORCPT ); Tue, 25 Sep 2012 21:20:03 -0400 Received: from perches-mx.perches.com ([206.117.179.246]:54936 "EHLO labridge.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753007Ab2IZBUB (ORCPT ); Tue, 25 Sep 2012 21:20:01 -0400 Message-ID: <1348622397.2648.13.camel@joe-AO722> Subject: [PATCH -next] device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit From: Joe Perches To: Geert Uytterhoeven Cc: Andrew Morton , Greg Kroah-Hartman , "David S. Miller" , Jason Baron , Jim Cromie , Kay Sievers , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 25 Sep 2012 18:19:57 -0700 In-Reply-To: References: <7cfb202968f0928bba66965146a828a1cff87950.1345978012.git.joe@perches.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.6.0-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also add __printf() verification for format string. Reported-by: Geert Uytterhoeven Signed-off-by: Joe Perches --- include/linux/device.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 8873603..86ef6ab 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -902,8 +902,9 @@ extern const char *dev_driver_string(const struct device *dev); #ifdef CONFIG_PRINTK -extern int dev_vprintk_emit(int level, const struct device *dev, - const char *fmt, va_list args); +extern __printf(3, 0) +int dev_vprintk_emit(int level, const struct device *dev, + const char *fmt, va_list args); extern __printf(3, 4) int dev_printk_emit(int level, const struct device *dev, const char *fmt, ...); @@ -927,8 +928,9 @@ int _dev_info(const struct device *dev, const char *fmt, ...); #else -static int dev_vprintk_emit(int level, const struct device *dev, - const char *fmt, va_list args) +static inline __printf(3, 0) +int dev_vprintk_emit(int level, const struct device *dev, + const char *fmt, va_list args) { return 0; } static inline __printf(3, 4) int dev_printk_emit(int level, const struct device *dev, const char *fmt, ...)