diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2020-02-23 08:31:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-23 16:06:58 -0800 |
| commit | 8ec80a8b120aa10c02f919680428b32982e75a97 (patch) | |
| tree | e90a7cf6f3927d1fec24b4d53042208c6d5cc444 | |
| parent | 2225d0803d3f742471a616397fbb1fb920f8299f (diff) | |
mlxsw: core: Remove dummy union name from struct mlxsw_listener
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>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.c | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 0d630096a28c..1ad959de909d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1611,11 +1611,11 @@ static int mlxsw_core_listener_register(struct mlxsw_core *mlxsw_core, { 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); } @@ -1625,11 +1625,11 @@ static void mlxsw_core_listener_unregister(struct mlxsw_core *mlxsw_core, { 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); } diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h index de56f489b6ab..ba767329e20d 100644 --- 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, \ |