Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1daf4170 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Merge efx_mcdi_mac_check_fault() and efx_mcdi_get_mac_faults() 



The latter is only called by the former, which is a very short
wrapper.  Further, gcc 4.5 may currently wrongly warn that the
'faults' variable may be used uninitialised.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 710b208d

drivers/net/ethernet/sfc/mcdi_mac.c

+7 −18
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int efx_mcdi_set_mac(struct efx_nic *efx) 
			    NULL, 0, NULL);

}



static int efx_mcdi_get_mac_faults(struct efx_nic *efx, u32 *faults)

bool efx_mcdi_mac_check_fault(struct efx_nic *efx)

{

	u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];

	size_t outlength;
@@ -61,16 +61,13 @@ static int efx_mcdi_get_mac_faults(struct efx_nic *efx, u32 *faults) 


	rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,

			  outbuf, sizeof(outbuf), &outlength);

	if (rc)

		goto fail;



	*faults = MCDI_DWORD(outbuf, GET_LINK_OUT_MAC_FAULT);

	return 0;



fail:

	if (rc) {

		netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",

			  __func__, rc);

	return rc;

		return true;

	}



	return MCDI_DWORD(outbuf, GET_LINK_OUT_MAC_FAULT) != 0;

}



int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
@@ -127,11 +124,3 @@ int efx_mcdi_mac_reconfigure(struct efx_nic *efx) 


	return 0;

}
 




bool efx_mcdi_mac_check_fault(struct efx_nic *efx)

{

	u32 faults;

	int rc = efx_mcdi_get_mac_faults(efx, &faults);

	return (rc != 0) || (faults != 0);

}