diff options
| author | Joe Perches <joe@perches.com> | 2012-09-25 18:19:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 13:56:59 -0700 |
| commit | 0a18b05043acc01d1d6a4bac459e62c79628881c (patch) | |
| tree | e0a10c9327cb188d84bb42641a4f78a32e61abe4 | |
| parent | e5445ee6a62329f6eb28b8ebd8ff4c4659ca0209 (diff) | |
| download | linux-3.10-0a18b05043acc01d1d6a4bac459e62c79628881c.tar.gz linux-3.10-0a18b05043acc01d1d6a4bac459e62c79628881c.tar.bz2 linux-3.10-0a18b05043acc01d1d6a4bac459e62c79628881c.zip | |
device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
Also add __printf() verification for format string.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | include/linux/device.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6d37e59db57..af92883bb4a 100644 --- a/include/linux/device.h +++ b/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, ...) |