aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-03-22 23:00:47 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-03-23 22:12:45 -0400
commit12a89dbac7914c58b0d207ef608e1c02534708bc (patch)
treea849a7aeb4485a0bee8f4dd3659e441630cf8e6a /drivers/net
parent2f6cf7944833bf9c63b945799b460988aec30040 (diff)
net/ethernet/sfc: Don't use of_node_to_eeh_dev()
This is deprecated, it forces the driver to hop via the OF node that may or may not exist, instead use pci_dev_to_eeh_dev() which is simpler. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Shradha Shah <sshah@solarflare.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sfc/efx.c4
-rw-r--r--drivers/net/ethernet/sfc/siena.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 238482495e81..77d6453f6a3e 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2523,9 +2523,7 @@ int efx_try_recovery(struct efx_nic *efx)
2523 * schedule a 'recover or reset', leading to this recovery handler. 2523 * schedule a 'recover or reset', leading to this recovery handler.
2524 * Manually call the eeh failure check function. 2524 * Manually call the eeh failure check function.
2525 */ 2525 */
2526 struct eeh_dev *eehdev = 2526 struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
2527 of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
2528
2529 if (eeh_dev_check_failure(eehdev)) { 2527 if (eeh_dev_check_failure(eehdev)) {
2530 /* The EEH mechanisms will handle the error and reset the 2528 /* The EEH mechanisms will handle the error and reset the
2531 * device if necessary. 2529 * device if necessary.
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 3583f0208a6e..f12c811938d2 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -205,8 +205,7 @@ static int siena_map_reset_flags(u32 *flags)
205 */ 205 */
206static void siena_monitor(struct efx_nic *efx) 206static void siena_monitor(struct efx_nic *efx)
207{ 207{
208 struct eeh_dev *eehdev = 208 struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
209 of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
210 209
211 eeh_dev_check_failure(eehdev); 210 eeh_dev_check_failure(eehdev);
212} 211}