瀏覽代碼

mellanox: Change en_print to return void

No caller or macro uses the return value so make it void.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Joe Perches 11 年之前
父節點
當前提交
0c87b29c31
共有 2 個文件被更改,包括 9 次插入12 次删除
  1. 7 10
      drivers/net/ethernet/mellanox/mlx4/en_main.c
  2. 2 2
      drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+ 7 - 10
drivers/net/ethernet/mellanox/mlx4/en_main.c

@@ -78,27 +78,24 @@ MLX4_EN_PARM_INT(inline_thold, MAX_INLINE,
 #define MAX_PFC_TX     0xff
 #define MAX_PFC_TX     0xff
 #define MAX_PFC_RX     0xff
 #define MAX_PFC_RX     0xff
 
 
-int en_print(const char *level, const struct mlx4_en_priv *priv,
-	     const char *format, ...)
+void en_print(const char *level, const struct mlx4_en_priv *priv,
+	      const char *format, ...)
 {
 {
 	va_list args;
 	va_list args;
 	struct va_format vaf;
 	struct va_format vaf;
-	int i;
 
 
 	va_start(args, format);
 	va_start(args, format);
 
 
 	vaf.fmt = format;
 	vaf.fmt = format;
 	vaf.va = &args;
 	vaf.va = &args;
 	if (priv->registered)
 	if (priv->registered)
-		i = printk("%s%s: %s: %pV",
-			   level, DRV_NAME, priv->dev->name, &vaf);
+		printk("%s%s: %s: %pV",
+		       level, DRV_NAME, priv->dev->name, &vaf);
 	else
 	else
-		i = printk("%s%s: %s: Port %d: %pV",
-			   level, DRV_NAME, dev_name(&priv->mdev->pdev->dev),
-			   priv->port, &vaf);
+		printk("%s%s: %s: Port %d: %pV",
+		       level, DRV_NAME, dev_name(&priv->mdev->pdev->dev),
+		       priv->port, &vaf);
 	va_end(args);
 	va_end(args);
-
-	return i;
 }
 }
 
 
 void mlx4_en_update_loopback_state(struct net_device *dev,
 void mlx4_en_update_loopback_state(struct net_device *dev,

+ 2 - 2
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

@@ -842,8 +842,8 @@ extern const struct ethtool_ops mlx4_en_ethtool_ops;
  */
  */
 
 
 __printf(3, 4)
 __printf(3, 4)
-int en_print(const char *level, const struct mlx4_en_priv *priv,
-	     const char *format, ...);
+void en_print(const char *level, const struct mlx4_en_priv *priv,
+	      const char *format, ...);
 
 
 #define en_dbg(mlevel, priv, format, ...)				\
 #define en_dbg(mlevel, priv, format, ...)				\
 do {									\
 do {									\