diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-10 16:55:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-10 16:55:14 -0500 |
commit | fb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch) | |
tree | ee3d535ab38d680b424a857406789f8c28bf5266 /drivers/net/mlx4 | |
parent | 23779897546c1effb546ff89b89803d9d955d517 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r-- | drivers/net/mlx4/mlx4_en.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index 11fb17c6e97b..cc022197e2a5 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
@@ -58,17 +58,17 @@ | |||
58 | #define mlx4_dbg(mlevel, priv, format, arg...) \ | 58 | #define mlx4_dbg(mlevel, priv, format, arg...) \ |
59 | if (NETIF_MSG_##mlevel & priv->msg_enable) \ | 59 | if (NETIF_MSG_##mlevel & priv->msg_enable) \ |
60 | printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\ | 60 | printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\ |
61 | (&priv->mdev->pdev->dev)->bus_id , ## arg) | 61 | (dev_name(&priv->mdev->pdev->dev)) , ## arg) |
62 | 62 | ||
63 | #define mlx4_err(mdev, format, arg...) \ | 63 | #define mlx4_err(mdev, format, arg...) \ |
64 | printk(KERN_ERR "%s %s: " format , DRV_NAME ,\ | 64 | printk(KERN_ERR "%s %s: " format , DRV_NAME ,\ |
65 | (&mdev->pdev->dev)->bus_id , ## arg) | 65 | (dev_name(&mdev->pdev->dev)) , ## arg) |
66 | #define mlx4_info(mdev, format, arg...) \ | 66 | #define mlx4_info(mdev, format, arg...) \ |
67 | printk(KERN_INFO "%s %s: " format , DRV_NAME ,\ | 67 | printk(KERN_INFO "%s %s: " format , DRV_NAME ,\ |
68 | (&mdev->pdev->dev)->bus_id , ## arg) | 68 | (dev_name(&mdev->pdev->dev)) , ## arg) |
69 | #define mlx4_warn(mdev, format, arg...) \ | 69 | #define mlx4_warn(mdev, format, arg...) \ |
70 | printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\ | 70 | printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\ |
71 | (&mdev->pdev->dev)->bus_id , ## arg) | 71 | (dev_name(&mdev->pdev->dev)) , ## arg) |
72 | 72 | ||
73 | /* | 73 | /* |
74 | * Device constants | 74 | * Device constants |