mlxsw: core: Remove dummy union name from struct mlxsw_listener (8ec80a8b) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlxsw/core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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, \