From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 13 Sep 2012 00:11:24 +0000 (+0100)
Subject: sfc: Use efx_mcdi_mon() to find efx_mcdi_mon structure from efx_nic
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e847b53e9e3c6f7818fe2fcd1082148423020ccc;p=openwrt%2Fstaging%2Fblogic.git

sfc: Use efx_mcdi_mon() to find efx_mcdi_mon structure from efx_nic

This needs to be done before we separate MCDI from siena_nic_data.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---

diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
index 1d552f0664d7..fe42c3bffd92 100644
--- a/drivers/net/ethernet/sfc/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -400,8 +400,7 @@ fail:
 
 void efx_mcdi_mon_remove(struct efx_nic *efx)
 {
-	struct siena_nic_data *nic_data = efx->nic_data;
-	struct efx_mcdi_mon *hwmon = &nic_data->hwmon;
+	struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
 	unsigned int i;
 
 	for (i = 0; i < hwmon->n_attrs; i++)