p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Benjamin Herrenschmidt 2015-03-23 14:00:47 +11:00
parent 2f6cf79448
commit 12a89dbac7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/sfc/efx.c
View File

@ -2523,9 +2523,7 @@ int efx_try_recovery(struct efx_nic *efx)
* schedule a 'recover or reset', leading to this recovery handler. * schedule a 'recover or reset', leading to this recovery handler.
* Manually call the eeh failure check function. * Manually call the eeh failure check function.
*/ */
struct eeh_dev *eehdev = struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
if (eeh_dev_check_failure(eehdev)) { if (eeh_dev_check_failure(eehdev)) {
/* The EEH mechanisms will handle the error and reset the /* The EEH mechanisms will handle the error and reset the
* device if necessary. * device if necessary.

3
drivers/net/ethernet/sfc/siena.c
View File

@ -205,8 +205,7 @@ static int siena_map_reset_flags(u32 *flags)
*/ */
static void siena_monitor(struct efx_nic *efx) static void siena_monitor(struct efx_nic *efx)
{ {
struct eeh_dev *eehdev = struct eeh_dev *eehdev = pci_dev_to_eeh_dev(efx->pci_dev);
of_node_to_eeh_dev(pci_device_to_OF_node(efx->pci_dev));
eeh_dev_check_failure(eehdev); eeh_dev_check_failure(eehdev);
} }