From: Shradha Shah <sshah@solarflare•com>
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>,
David Miller <davem@davemloft•net>
Cc: <netdev@vger•kernel.org>
Subject: Re: sfc fixup patch
Date: Mon, 23 Mar 2015 10:55:15 +0000 [thread overview]
Message-ID: <550FF113.8000209@solarflare.com> (raw)
In-Reply-To: <1427080232.4770.212.camel@kernel.crashing.org>
On 23/03/15 03:10, Benjamin Herrenschmidt wrote:
> Hi Dave, Shradha !
>
> While merging some EEH changes, I noticed a breakage in the SFC driver
> due to it using an API we didn't mean driver to use directly and that
> is going away. I've done this small fixup patch, any objection to me
> sticking it in the original series (as to avoid bisection breaks)
> before I send it to Linus ?
>
> Cheers,
> Ben.
>
> 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>
> ---
> drivers/net/ethernet/sfc/efx.c | 4 +---
> drivers/net/ethernet/sfc/siena.c | 3 +--
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
> index 2384824..77d6453 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)
> * 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
> index 3583f02..f12c811 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)
> */
> 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);
> }
>
>
--
Many Thanks,
Regards,
Shradha Shah
next prev parent reply other threads:[~2015-03-23 11:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 3:10 sfc fixup patch Benjamin Herrenschmidt
2015-03-23 10:55 ` Shradha Shah [this message]
2015-03-23 11:05 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=550FF113.8000209@solarflare.com \
--to=sshah@solarflare$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox