Commit 31b143e5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-clean-up-some-W-1-build-warnings' 



Edward Cree says:

====================
sfc: clean up some W=1 build warnings

A collection of minor fixes to issues flagged up by W=1.
After this series, the only remaining warnings in the sfc driver are
 some 'member missing in kerneldoc' warnings from ptp.c.
Tested by building on x86_64 and running 'ethtool -p' on an EF10 NIC;
 there was no error, but I couldn't observe the actual LED as I'm
 working remotely.

[ Incidentally, ethtool_phys_id()'s behaviour on an error return
  looks strange — if I'm reading it right, it will break out of the
  inner loop but not the outer one, and eventually return the rc
  from the last run of the inner loop.  Is this intended? ]
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd10d459 f2ed621f

drivers/net/ethernet/sfc/ef10.c

+0 −2
Original line number Diff line number Diff line
@@ -3955,7 +3955,6 @@ const struct efx_nic_type efx_hunt_a0_vf_nic_type = { 
	.start_stats = efx_port_dummy_op_void,

	.pull_stats = efx_port_dummy_op_void,

	.stop_stats = efx_port_dummy_op_void,

	.set_id_led = efx_mcdi_set_id_led,

	.push_irq_moderation = efx_ef10_push_irq_moderation,

	.reconfigure_mac = efx_ef10_mac_reconfigure,

	.check_mac_fault = efx_mcdi_mac_check_fault,
@@ -4066,7 +4065,6 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.start_stats = efx_mcdi_mac_start_stats,

	.pull_stats = efx_mcdi_mac_pull_stats,

	.stop_stats = efx_mcdi_mac_stop_stats,

	.set_id_led = efx_mcdi_set_id_led,

	.push_irq_moderation = efx_ef10_push_irq_moderation,

	.reconfigure_mac = efx_ef10_mac_reconfigure,

	.check_mac_fault = efx_mcdi_mac_check_fault,

drivers/net/ethernet/sfc/ethtool.c

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ static int efx_ethtool_phys_id(struct net_device *net_dev, 
		return 1;	/* cycle on/off once per second */

	}



	efx->type->set_id_led(efx, mode);

	return 0;

	return efx_mcdi_set_id_led(efx, mode);

}



static int efx_ethtool_get_regs_len(struct net_device *net_dev)

drivers/net/ethernet/sfc/farch.c

+2 −7
Original line number Diff line number Diff line
@@ -863,13 +863,8 @@ static u16 efx_farch_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
	bool rx_ev_tcp_udp_chksum_err, rx_ev_eth_crc_err;

	bool rx_ev_frm_trunc, rx_ev_tobe_disc;

	bool rx_ev_other_err, rx_ev_pause_frm;

	bool rx_ev_hdr_type, rx_ev_mcast_pkt;

	unsigned rx_ev_pkt_type;



	rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);

	rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_MCAST_PKT);

	rx_ev_tobe_disc = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_TOBE_DISC);

	rx_ev_pkt_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_TYPE);

	rx_ev_buf_owner_id_err = EFX_QWORD_FIELD(*event,

						 FSF_AZ_RX_EV_BUF_OWNER_ID_ERR);

	rx_ev_ip_hdr_chksum_err = EFX_QWORD_FIELD(*event,
@@ -918,6 +913,8 @@ static u16 efx_farch_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
			  rx_ev_tobe_disc ? " [TOBE_DISC]" : "",

			  rx_ev_pause_frm ? " [PAUSE]" : "");

	}

#else

	(void) rx_ev_other_err;

#endif



	if (efx->net_dev->features & NETIF_F_RXALL)
@@ -2592,7 +2589,6 @@ int efx_farch_filter_remove_safe(struct efx_nic *efx, 
	enum efx_farch_filter_table_id table_id;

	struct efx_farch_filter_table *table;

	unsigned int filter_idx;

	struct efx_farch_filter_spec *spec;

	int rc;



	table_id = efx_farch_filter_id_table_id(filter_id);
@@ -2604,7 +2600,6 @@ int efx_farch_filter_remove_safe(struct efx_nic *efx, 
	if (filter_idx >= table->size)

		return -ENOENT;

	down_write(&state->lock);

	spec = &table->spec[filter_idx];



	rc = efx_farch_filter_remove(efx, table, filter_idx, priority);

	up_write(&state->lock);

drivers/net/ethernet/sfc/mcdi.c

+2 −4
Original line number Diff line number Diff line
@@ -1868,10 +1868,9 @@ int efx_mcdi_handle_assertion(struct efx_nic *efx) 
	return efx_mcdi_exit_assertion(efx);

}



void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)

int efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)

{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_SET_ID_LED_IN_LEN);

	int rc;



	BUILD_BUG_ON(EFX_LED_OFF != MC_CMD_LED_OFF);

	BUILD_BUG_ON(EFX_LED_ON != MC_CMD_LED_ON);
@@ -1881,8 +1880,7 @@ void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode) 


	MCDI_SET_DWORD(inbuf, SET_ID_LED_IN_STATE, mode);



	rc = efx_mcdi_rpc(efx, MC_CMD_SET_ID_LED, inbuf, sizeof(inbuf),

			  NULL, 0, NULL);

	return efx_mcdi_rpc(efx, MC_CMD_SET_ID_LED, inbuf, sizeof(inbuf), NULL, 0, NULL);

}



static int efx_mcdi_reset_func(struct efx_nic *efx)

drivers/net/ethernet/sfc/mcdi.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int efx_mcdi_nvram_info(struct efx_nic *efx, unsigned int type, 
int efx_new_mcdi_nvram_test_all(struct efx_nic *efx);

int efx_mcdi_nvram_test_all(struct efx_nic *efx);

int efx_mcdi_handle_assertion(struct efx_nic *efx);

void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode);

int efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode);

int efx_mcdi_wol_filter_set_magic(struct efx_nic *efx, const u8 *mac,

				  int *id_out);

int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out);

CRA Git | Maintained and supported by SUSTech CRA and CCSE