From: Jiri Pirko <jiri@mellanox.com>
Date: Sun, 23 Feb 2020 08:31:38 +0100
Subject: mlxsw: core: Remove dummy union name from struct mlxsw_listener
Patch-mainline: v5.7-rc1
Git-commit: 8ec80a8b120aa10c02f919680428b32982e75a97
References: bsc#1176774
The dummy name for union is no longer needed, remove it.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/mellanox/mlxsw/core.c | 8 ++++----
drivers/net/ethernet/mellanox/mlxsw/core.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1614,11 +1614,11 @@ static int mlxsw_core_listener_register(
{
if (listener->is_event)
return mlxsw_core_event_listener_register(mlxsw_core,
- &listener->u.event_listener,
+ &listener->event_listener,
priv);
else
return mlxsw_core_rx_listener_register(mlxsw_core,
- &listener->u.rx_listener,
+ &listener->rx_listener,
priv);
}
@@ -1628,11 +1628,11 @@ static void mlxsw_core_listener_unregist
{
if (listener->is_event)
mlxsw_core_event_listener_unregister(mlxsw_core,
- &listener->u.event_listener,
+ &listener->event_listener,
priv);
else
mlxsw_core_rx_listener_unregister(mlxsw_core,
- &listener->u.rx_listener,
+ &listener->rx_listener,
priv);
}
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -75,7 +75,7 @@ struct mlxsw_listener {
union {
struct mlxsw_rx_listener rx_listener;
struct mlxsw_event_listener event_listener;
- } u;
+ };
enum mlxsw_reg_hpkt_action action;
enum mlxsw_reg_hpkt_action unreg_action;
u8 trap_group;
@@ -87,7 +87,7 @@ struct mlxsw_listener {
_unreg_action) \
{ \
.trap_id = MLXSW_TRAP_ID_##_trap_id, \
- .u.rx_listener = \
+ .rx_listener = \
{ \
.func = _func, \
.local_port = MLXSW_PORT_DONT_CARE, \
@@ -103,7 +103,7 @@ struct mlxsw_listener {
#define MLXSW_EVENTL(_func, _trap_id, _trap_group) \
{ \
.trap_id = MLXSW_TRAP_ID_##_trap_id, \
- .u.event_listener = \
+ .event_listener = \
{ \
.func = _func, \
.trap_id = MLXSW_TRAP_ID_##_trap_id, \