net/mlx5_core: Improve mlx5 messages

Improve the messages printed by the mlx5 macros to include the device
string. In addition, prefix names used by the macros with two underscores
to avoid possible name collisions.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index 566a70488db12ddef46f5623cb77c3e1e4c4ab2c..30c0be721b089073b6b028630a64fa79e9e1fc17 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -43,25 +43,25 @@
 
 extern int mlx5_core_debug_mask;
 
-#define mlx5_core_dbg(dev, format, ...)                                        \
-       pr_debug("%s:%s:%d:(pid %d): " format,                          \
-                (dev)->priv.name, __func__, __LINE__, current->pid,    \
+#define mlx5_core_dbg(__dev, format, ...)                              \
+       dev_dbg(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,      \
+                (__dev)->priv.name, __func__, __LINE__, current->pid,  \
                 ##__VA_ARGS__)
 
-#define mlx5_core_dbg_mask(dev, mask, format, ...)                     \
+#define mlx5_core_dbg_mask(__dev, mask, format, ...)                   \
 do {                                                                   \
        if ((mask) & mlx5_core_debug_mask)                              \
-               mlx5_core_dbg(dev, format, ##__VA_ARGS__);              \
+               mlx5_core_dbg(__dev, format, ##__VA_ARGS__);            \
 } while (0)
 
-#define mlx5_core_err(dev, format, ...)                                        \
-       pr_err("%s:%s:%d:(pid %d): " format,                            \
-              (dev)->priv.name, __func__, __LINE__, current->pid,      \
+#define mlx5_core_err(__dev, format, ...)                              \
+       dev_err(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,      \
+              (__dev)->priv.name, __func__, __LINE__, current->pid,    \
               ##__VA_ARGS__)
 
-#define mlx5_core_warn(dev, format, ...)                               \
-       pr_warn("%s:%s:%d:(pid %d): " format,                           \
-               (dev)->priv.name, __func__, __LINE__, current->pid,     \
+#define mlx5_core_warn(__dev, format, ...)                             \
+       dev_warn(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,     \
+               (__dev)->priv.name, __func__, __LINE__, current->pid,   \
                ##__VA_ARGS__)
 
 enum {