---

yaml --- r: 324451 b: refs/heads/master c: 0a18b05 h: refs/heads/master i: 324449: 87dd57f 324447: a3176d1 v: v3
git-mirror · Sep 26, 2012 · a1eb2ca · a1eb2ca
1 parent 29f428d
commit a1eb2ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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, ...)