From: Huy Nguyen <h...@mellanox.com>

Detach mlx5_core mdev messages from pci device mdev->pdev messages and
provide a better report/debug of different mlx5 device types.

This patch does not change any functionality.

Signed-off-by: Huy Nguyen <h...@mellanox.com>
Signed-off-by: Vu Pham <vuhu...@mellanox.com>
Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
---
 .../ethernet/mellanox/mlx5/core/mlx5_core.h   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h 
b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index 7b331674622c..052e81974c3b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -48,12 +48,12 @@
 extern uint mlx5_core_debug_mask;
 
 #define mlx5_core_dbg(__dev, format, ...)                              \
-       dev_dbg(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,         \
+       pr_debug("%s:%s:%d:(pid %d): " format, (__dev)->priv.name,      \
                 __func__, __LINE__, current->pid,                      \
                 ##__VA_ARGS__)
 
 #define mlx5_core_dbg_once(__dev, format, ...)                         \
-       dev_dbg_once(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,    \
+       pr_debug_once("%s:%s:%d:(pid %d): " format, (__dev)->priv.name, \
                     __func__, __LINE__, current->pid,                  \
                     ##__VA_ARGS__)
 
@@ -64,28 +64,27 @@ do {                                                        
                \
 } while (0)
 
 #define mlx5_core_err(__dev, format, ...)                              \
-       dev_err(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format, \
+       pr_err("%s:%s:%d:(pid %d): " format, (__dev)->priv.name,        \
                __func__, __LINE__, current->pid,       \
               ##__VA_ARGS__)
 
-#define mlx5_core_err_rl(__dev, format, ...)                           \
-       dev_err_ratelimited(&(__dev)->pdev->dev,                        \
-                          "%s:%d:(pid %d): " format,                   \
-                          __func__, __LINE__, current->pid,            \
+#define mlx5_core_err_rl(__dev, format, ...)                                \
+       pr_err_ratelimited("%s:%s:%d:(pid %d): " format, (__dev)->priv.name, \
+                          __func__, __LINE__, current->pid,                 \
                           ##__VA_ARGS__)
 
 #define mlx5_core_warn(__dev, format, ...)                             \
-       dev_warn(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,        \
+       pr_warn("%s:%s:%d:(pid %d): " format, (__dev)->priv.name,       \
                 __func__, __LINE__, current->pid,                      \
                ##__VA_ARGS__)
 
 #define mlx5_core_warn_once(__dev, format, ...)                                
\
-       dev_warn_once(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,   \
+       pr_warn_once("%s:%s:%d:(pid %d): " format, (__dev)->priv.name,  \
                      __func__, __LINE__, current->pid,                 \
                      ##__VA_ARGS__)
 
 #define mlx5_core_info(__dev, format, ...)                             \
-       dev_info(&(__dev)->pdev->dev, format, ##__VA_ARGS__)
+       pr_info("%s " format, (__dev)->priv.name, ##__VA_ARGS__)
 
 enum {
        MLX5_CMD_DATA, /* print command payload only */
-- 
2.20.1

Reply via email to