3 files changed, 6 insertions, 27 deletions

diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 6232227f56c3..944ad47c9519 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -776,8 +776,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                 } else
                         netif_receive_skb(skb);
 
-                dev->last_rx = jiffies;
-
 next:
                 ++cq->mcq.cons_index;
                 index = (cq->mcq.cons_index) & ring->size_mask;
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 592c01ae2c5d..b1622062b12d 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -118,17 +118,7 @@ static int find_mgm(struct mlx4_dev *dev,
                 return err;
 
         if (0)
-                mlx4_dbg(dev, "Hash for %04x:%04x:%04x:%04x:"
-                          "%04x:%04x:%04x:%04x is %04x\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]),
-                          *hash);
+                mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
         *index = *hash;
         *prev  = -1;
@@ -277,16 +267,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
                 goto out;
 
         if (index == -1) {
-                mlx4_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                          "not found\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]));
+                mlx4_err(dev, "MGID %pI6 not found\n", gid);
                 err = -EINVAL;
                 goto out;
         }
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index 98ddc0811f93..24f6d2585a6e 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -58,17 +58,17 @@
 #define mlx4_dbg(mlevel, priv, format, arg...)  \
         if (NETIF_MSG_##mlevel & priv->msg_enable) \
         printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
-                (&priv->mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&priv->mdev->pdev->dev)) , ## arg)
 
 #define mlx4_err(mdev, format, arg...) \
         printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 #define mlx4_info(mdev, format, arg...) \
         printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 #define mlx4_warn(mdev, format, arg...) \
         printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 
 /*
  * Device constants