diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-09-18 03:33:55 +0200 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 20:43:09 +0200 |
| commit | f073dde03b3e8d11050d82f52caaf75fd924e069 (patch) | |
| tree | e274bf18716b262392e05d9351bf4ae5a437d27c /drivers/net/ethernet/sfc/siena.c | |
| parent | sfc: Collect all MCDI port functions into mcdi_port.c (diff) | |
| download | linux-f073dde03b3e8d11050d82f52caaf75fd924e069.tar.xz linux-f073dde03b3e8d11050d82f52caaf75fd924e069.zip | |
sfc: Make efx_mcdi_init() call efx_mcdi_handle_assertion()
This should probably be done during MCDI initialisation for any NIC.
Change efx_mcdi_init() to return an error code.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/siena.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index b5d5568485d0..3dca771938f0 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c @@ -210,10 +210,7 @@ static int siena_probe_nic(struct efx_nic *efx) efx_reado(efx, ®, FR_AZ_CS_DEBUG); efx->port_num = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; - efx_mcdi_init(efx); - - /* Recover from a failed assertion before probing */ - rc = efx_mcdi_handle_assertion(efx); + rc = efx_mcdi_init(efx); if (rc) goto fail1; |