net/ethernet/sfc: Don't use of_node_to_eeh_dev()

ozbenh · ozbenh · commit 12a89dbac791 · 2015-03-24T13:12:45.000+11:00
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 &lt;benh@kernel.crashing.org&gt;
Acked-by: Shradha Shah &lt;sshah@solarflare.com&gt;
diff --git 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)
 	 * schedule a 'recover or reset', leading to this recovery handler.
 	 * Manually call the eeh failure check function.
 	 */
-	struct eeh_dev *eehdev =
-		of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
-
+	struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
 	if (eeh_dev_check_failure(eehdev)) {
 		/* The EEH mechanisms will handle the error and reset the
 		 * device if necessary.
diff --git 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)
  */
 static void siena_monitor(struct efx_nic *efx)
 {
-	struct eeh_dev *eehdev =
-		of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
+	struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
 
 	eeh_dev_check_failure(eehdev);
 }

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,7 @@ static int siena_map_reset_flags(u32 *flags)`
`205`	`205`	`*/`
`206`	`206`	`static void siena_monitor(struct efx_nic *efx)`
`207`	`207`	`{`
`208`		`- struct eeh_dev *eehdev =`
`209`		`- of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));`
	`208`	`+ struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);`
`210`	`209`
`211`	`210`	`eeh_dev_check_failure(eehdev);`
`212`	`211`	`}`