From a1eb2cadafd030a41afc260e5acd2ad366746a52 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 25 Sep 2012 18:19:57 -0700 Subject: [PATCH] --- yaml --- r: 324451 b: refs/heads/master c: 0a18b05043acc01d1d6a4bac459e62c79628881c h: refs/heads/master i: 324449: 87dd57f4062d155b622503538f9821929172cc20 324447: a3176d19e10466985d31e90a921a3c42dd0d296a v: v3 --- [refs] | 2 +- trunk/include/linux/device.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3165d205e2fe..a7dd9072184f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5445ee6a62329f6eb28b8ebd8ff4c4659ca0209 +refs/heads/master: 0a18b05043acc01d1d6a4bac459e62c79628881c diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index 6d37e59db571..af92883bb4a6 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -895,8 +895,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, ...); @@ -920,8 +921,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, ...)