mellanox: Logging message cleanups

Use a more current logging style.

o Coalesce formats
o Add missing spaces for coalesced formats
o Align arguments for modified formats
o Add missing newlines for some logging messages
o Use DRV_NAME as part of format instead of %s, DRV_NAME to
  reduce overall text.
o Use ..., ##__VA_ARGS__ instead of args... in macros
o Correct a few format typos
o Use a single line message where appropriate

Signed-off-by: Joe Perches <joe@perches.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 04d9b6fe3e80..b5db1bf361dc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -830,26 +830,26 @@ __printf(3, 4)
 int en_print(const char *level, const struct mlx4_en_priv *priv,
              const char *format, ...);
 
-#define en_dbg(mlevel, priv, format, arg...)                    \
-do {                                                            \
-        if (NETIF_MSG_##mlevel & priv->msg_enable)              \
-                en_print(KERN_DEBUG, priv, format, ##arg);      \
+#define en_dbg(mlevel, priv, format, ...)                               \
+do {                                                                    \
+        if (NETIF_MSG_##mlevel & (priv)->msg_enable)                    \
+                en_print(KERN_DEBUG, priv, format, ##__VA_ARGS__);      \
 } while (0)
-#define en_warn(priv, format, arg...)                   \
-        en_print(KERN_WARNING, priv, format, ##arg)
-#define en_err(priv, format, arg...)                    \
-        en_print(KERN_ERR, priv, format, ##arg)
-#define en_info(priv, format, arg...)                   \
-        en_print(KERN_INFO, priv, format, ## arg)
-
-#define mlx4_err(mdev, format, arg...)                  \
-        pr_err("%s %s: " format, DRV_NAME,              \
-               dev_name(&mdev->pdev->dev), ##arg)
-#define mlx4_info(mdev, format, arg...)                 \
-        pr_info("%s %s: " format, DRV_NAME,             \
-                dev_name(&mdev->pdev->dev), ##arg)
-#define mlx4_warn(mdev, format, arg...)                 \
-        pr_warning("%s %s: " format, DRV_NAME,          \
-                   dev_name(&mdev->pdev->dev), ##arg)
+#define en_warn(priv, format, ...)                                      \
+        en_print(KERN_WARNING, priv, format, ##__VA_ARGS__)
+#define en_err(priv, format, ...)                                       \
+        en_print(KERN_ERR, priv, format, ##__VA_ARGS__)
+#define en_info(priv, format, ...)                                      \
+        en_print(KERN_INFO, priv, format, ##__VA_ARGS__)
+
+#define mlx4_err(mdev, format, ...)                                     \
+        pr_err(DRV_NAME " %s: " format,                                 \
+               dev_name(&(mdev)->pdev->dev), ##__VA_ARGS__)
+#define mlx4_info(mdev, format, ...)                                    \
+        pr_info(DRV_NAME " %s: " format,                                \
+                dev_name(&(mdev)->pdev->dev), ##__VA_ARGS__)
+#define mlx4_warn(mdev, format, ...)                                    \
+        pr_warn(DRV_NAME " %s: " format,                                \
+                dev_name(&(mdev)->pdev->dev), ##__VA_ARGS__)
 
 #endif