* [PATCH net-next] mellanox: Change en_print to return void
@ 2014-09-22 17:40 Joe Perches
2014-09-23 5:45 ` Amir Vadai
2014-09-26 19:17 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Joe Perches @ 2014-09-22 17:40 UTC (permalink / raw)
To: Amir Vadai; +Cc: netdev, LKML
No caller or macro uses the return value so make it void.
Signed-off-by: Joe Perches <joe@perches.com>
---
This change is associated to a desire to eventually
change printk to return void.
drivers/net/ethernet/mellanox/mlx4/en_main.c | 17 +++++++----------
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 ++--
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 3626fdf..2091ae88 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/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_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;
struct va_format vaf;
- int i;
va_start(args, format);
vaf.fmt = format;
vaf.va = &args;
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
- 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);
-
- return i;
}
void mlx4_en_update_loopback_state(struct net_device *dev,
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 3de41be..03e95f7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -836,8 +836,8 @@ extern const struct ethtool_ops mlx4_en_ethtool_ops;
*/
__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, ...) \
do { \
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] mellanox: Change en_print to return void
2014-09-22 17:40 [PATCH net-next] mellanox: Change en_print to return void Joe Perches
@ 2014-09-23 5:45 ` Amir Vadai
2014-09-26 19:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Amir Vadai @ 2014-09-23 5:45 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, LKML
On 9/22/2014 8:40 PM, Joe Perches wrote:
> No caller or macro uses the return value so make it void.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> This change is associated to a desire to eventually
> change printk to return void.
>
> drivers/net/ethernet/mellanox/mlx4/en_main.c | 17 +++++++----------
> drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 ++--
> 2 files changed, 9 insertions(+), 12 deletions(-)
Thanks Joe.
Acked-By: Amir Vadai <amirv@mellanox.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] mellanox: Change en_print to return void
2014-09-22 17:40 [PATCH net-next] mellanox: Change en_print to return void Joe Perches
2014-09-23 5:45 ` Amir Vadai
@ 2014-09-26 19:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-09-26 19:17 UTC (permalink / raw)
To: joe; +Cc: amirv, netdev, linux-kernel
From: Joe Perches <joe@perches.com>
Date: Mon, 22 Sep 2014 10:40:22 -0700
> No caller or macro uses the return value so make it void.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> This change is associated to a desire to eventually
> change printk to return void.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-26 19:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-22 17:40 [PATCH net-next] mellanox: Change en_print to return void Joe Perches
2014-09-23 5:45 ` Amir Vadai
2014-09-26 19:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).