cisco: enic: Update logging macros and uses

[cascardo/linux.git] / drivers / net / ethernet / cisco / enic / enic.h

diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index 7ba6d53..130f910 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -201,16 +201,20 @@ static inline struct net_device *vnic_get_netdev(struct vnic_dev *vdev)
 }
 
 /* wrappers function for kernel log
- * Make sure variable vdev of struct vnic_dev is available in the block where
- * these macros are used
  */
-#define vdev_info(args...)     dev_info(&vdev->pdev->dev, args)
-#define vdev_warn(args...)     dev_warn(&vdev->pdev->dev, args)
-#define vdev_err(args...)      dev_err(&vdev->pdev->dev, args)
-
-#define vdev_netinfo(args...)  netdev_info(vnic_get_netdev(vdev), args)
-#define vdev_netwarn(args...)  netdev_warn(vnic_get_netdev(vdev), args)
-#define vdev_neterr(args...)   netdev_err(vnic_get_netdev(vdev), args)
+#define vdev_err(vdev, fmt, ...)                                       \
+       dev_err(&(vdev)->pdev->dev, fmt, ##__VA_ARGS__)
+#define vdev_warn(vdev, fmt, ...)                                      \
+       dev_warn(&(vdev)->pdev->dev, fmt, ##__VA_ARGS__)
+#define vdev_info(vdev, fmt, ...)                                      \
+       dev_info(&(vdev)->pdev->dev, fmt, ##__VA_ARGS__)
+
+#define vdev_neterr(vdev, fmt, ...)                                    \
+       netdev_err(vnic_get_netdev(vdev), fmt, ##__VA_ARGS__)
+#define vdev_netwarn(vdev, fmt, ...)                                   \
+       netdev_warn(vnic_get_netdev(vdev), fmt, ##__VA_ARGS__)
+#define vdev_netinfo(vdev, fmt, ...)                                   \
+       netdev_info(vnic_get_netdev(vdev), fmt, ##__VA_ARGS__)
 
 static inline struct device *enic_get_dev(struct enic *enic)
 {