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

Commit 12a89dba authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarShradha Shah <sshah@solarflare.com>
parent 2f6cf794

drivers/net/ethernet/sfc/efx.c

+1 −3
Original line number Diff line number Diff line
@@ -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.

drivers/net/ethernet/sfc/siena.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}