HID: core: reformat and reduce hid_printk macros

Reformat hid_printk macros to use standard __VA_ARGS__ syntax.
Per Joe Perches hid_printk(), hid_emerg(), hid_crit(), and hid_alert() are
unlikely ever to be used. Remove them.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

diff --git a/include/linux/hid.h b/include/linux/hid.h
index d770ab1..e6c7efd 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -1154,29 +1154,21 @@ int hid_pidff_init(struct hid_device *hid);
 #define hid_pidff_init NULL
 #endif
 
-#define dbg_hid(format, arg...)                                                \
+#define dbg_hid(fmt, ...)                                              \
 do {                                                                   \
        if (hid_debug)                                                  \
-               printk(KERN_DEBUG "%s: " format, __FILE__, ##arg);      \
+               printk(KERN_DEBUG "%s: " fmt, __FILE__, ##__VA_ARGS__); \
 } while (0)
 
-#define hid_printk(level, hid, fmt, arg...)            \
-       dev_printk(level, &(hid)->dev, fmt, ##arg)
-#define hid_emerg(hid, fmt, arg...)                    \
-       dev_emerg(&(hid)->dev, fmt, ##arg)
-#define hid_crit(hid, fmt, arg...)                     \
-       dev_crit(&(hid)->dev, fmt, ##arg)
-#define hid_alert(hid, fmt, arg...)                    \
-       dev_alert(&(hid)->dev, fmt, ##arg)
-#define hid_err(hid, fmt, arg...)                      \
-       dev_err(&(hid)->dev, fmt, ##arg)
-#define hid_notice(hid, fmt, arg...)                   \
-       dev_notice(&(hid)->dev, fmt, ##arg)
-#define hid_warn(hid, fmt, arg...)                     \
-       dev_warn(&(hid)->dev, fmt, ##arg)
-#define hid_info(hid, fmt, arg...)                     \
-       dev_info(&(hid)->dev, fmt, ##arg)
-#define hid_dbg(hid, fmt, arg...)                      \
-       dev_dbg(&(hid)->dev, fmt, ##arg)
+#define hid_err(hid, fmt, ...)                         \
+       dev_err(&(hid)->dev, fmt, ##__VA_ARGS__)
+#define hid_notice(hid, fmt, ...)                      \
+       dev_notice(&(hid)->dev, fmt, ##__VA_ARGS__)
+#define hid_warn(hid, fmt, ...)                                \
+       dev_warn(&(hid)->dev, fmt, ##__VA_ARGS__)
+#define hid_info(hid, fmt, ...)                                \
+       dev_info(&(hid)->dev, fmt, ##__VA_ARGS__)
+#define hid_dbg(hid, fmt, ...)                         \
+       dev_dbg(&(hid)->dev, fmt, ##__VA_ARGS__)
 
 #endif