From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40FB51A082E for ; Thu, 22 May 2014 07:58:12 +1000 (EST) Received: by mail-lb0-f169.google.com with SMTP id s7so2035862lbd.14 for ; Wed, 21 May 2014 14:58:08 -0700 (PDT) Message-ID: <537D2174.8040405@cogentembedded.com> Date: Thu, 22 May 2014 01:58:12 +0400 From: Sergei Shtylyov MIME-Version: 1.0 To: Florian Fainelli , netdev@vger.kernel.org Subject: Re: [PATCH RESEND net-next 5/9] fs_enet: use the new fixed PHY helpers References: <1400708331-18088-1-git-send-email-f.fainelli@gmail.com> <1400708331-18088-6-git-send-email-f.fainelli@gmail.com> In-Reply-To: <1400708331-18088-6-git-send-email-f.fainelli@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: Thomas Petazzoni , "open list:OPEN FIRMWARE AND..." , Aida Mynzhasova , Richard Cochran , open list , Claudiu Manoil , Vitaly Bordug , Grant Likely , "open list:LINUX FOR POWERPC..." , davem@davemloft.net List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 05/22/2014 01:38 AM, Florian Fainelli wrote: > of_phy_connect_fixed_link() is becoming obsolete, and also required > platform code to register the fixed PHYs at the specified addresses for > those to be usable. Get rid of it and use the new of_phy_is_fixed_link() > plus of_phy_register_fixed_link() helpers to transition over the new > scheme. > Signed-off-by: Florian Fainelli > --- > drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > index dc80db41d6b3..d602711e00e9 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c [...] > @@ -1029,9 +1025,15 @@ static int fs_enet_probe(struct platform_device *ofdev) > fpi->use_napi = 1; > fpi->napi_weight = 17; > fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0); > - if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link", > - NULL))) > - goto out_free_fpi; > + if (!fpi->phy_node) { > + if (of_phy_is_fixed_link(ofdev->dev.of_node)) { These two *if* statements could be collapsed, reducing the indentation level below. > + err = of_phy_register_fixed_link(ofdev->dev.of_node); > + if (err) > + goto out_free_fpi; > + > + fpi->phy_node = ofdev->dev.of_node; > + } > + } WBR, Sergei From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH RESEND net-next 5/9] fs_enet: use the new fixed PHY helpers Date: Thu, 22 May 2014 01:58:12 +0400 Message-ID: <537D2174.8040405@cogentembedded.com> References: <1400708331-18088-1-git-send-email-f.fainelli@gmail.com> <1400708331-18088-6-git-send-email-f.fainelli@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1400708331-18088-6-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Florian Fainelli , netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org, Pantelis Antoniou , Vitaly Bordug , Li Yang , Grant Likely , Thomas Petazzoni , Aida Mynzhasova , Richard Cochran , Claudiu Manoil , "open list:OPEN FIRMWARE AND..." , open list , "open list:LINUX FOR POWERPC..." List-Id: devicetree@vger.kernel.org On 05/22/2014 01:38 AM, Florian Fainelli wrote: > of_phy_connect_fixed_link() is becoming obsolete, and also required > platform code to register the fixed PHYs at the specified addresses for > those to be usable. Get rid of it and use the new of_phy_is_fixed_link() > plus of_phy_register_fixed_link() helpers to transition over the new > scheme. > Signed-off-by: Florian Fainelli > --- > drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > index dc80db41d6b3..d602711e00e9 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c [...] > @@ -1029,9 +1025,15 @@ static int fs_enet_probe(struct platform_device *ofdev) > fpi->use_napi = 1; > fpi->napi_weight = 17; > fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0); > - if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link", > - NULL))) > - goto out_free_fpi; > + if (!fpi->phy_node) { > + if (of_phy_is_fixed_link(ofdev->dev.of_node)) { These two *if* statements could be collapsed, reducing the indentation level below. > + err = of_phy_register_fixed_link(ofdev->dev.of_node); > + if (err) > + goto out_free_fpi; > + > + fpi->phy_node = ofdev->dev.of_node; > + } > + } WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753548AbaEUV6M (ORCPT ); Wed, 21 May 2014 17:58:12 -0400 Received: from mail-lb0-f176.google.com ([209.85.217.176]:39671 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753239AbaEUV6K (ORCPT ); Wed, 21 May 2014 17:58:10 -0400 Message-ID: <537D2174.8040405@cogentembedded.com> Date: Thu, 22 May 2014 01:58:12 +0400 From: Sergei Shtylyov Organization: Cogent Embedded User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Florian Fainelli , netdev@vger.kernel.org CC: davem@davemloft.net, Pantelis Antoniou , Vitaly Bordug , Li Yang , Grant Likely , Thomas Petazzoni , Aida Mynzhasova , Richard Cochran , Claudiu Manoil , "open list:OPEN FIRMWARE AND..." , open list , "open list:LINUX FOR POWERPC..." Subject: Re: [PATCH RESEND net-next 5/9] fs_enet: use the new fixed PHY helpers References: <1400708331-18088-1-git-send-email-f.fainelli@gmail.com> <1400708331-18088-6-git-send-email-f.fainelli@gmail.com> In-Reply-To: <1400708331-18088-6-git-send-email-f.fainelli@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/22/2014 01:38 AM, Florian Fainelli wrote: > of_phy_connect_fixed_link() is becoming obsolete, and also required > platform code to register the fixed PHYs at the specified addresses for > those to be usable. Get rid of it and use the new of_phy_is_fixed_link() > plus of_phy_register_fixed_link() helpers to transition over the new > scheme. > Signed-off-by: Florian Fainelli > --- > drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > index dc80db41d6b3..d602711e00e9 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c [...] > @@ -1029,9 +1025,15 @@ static int fs_enet_probe(struct platform_device *ofdev) > fpi->use_napi = 1; > fpi->napi_weight = 17; > fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0); > - if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link", > - NULL))) > - goto out_free_fpi; > + if (!fpi->phy_node) { > + if (of_phy_is_fixed_link(ofdev->dev.of_node)) { These two *if* statements could be collapsed, reducing the indentation level below. > + err = of_phy_register_fixed_link(ofdev->dev.of_node); > + if (err) > + goto out_free_fpi; > + > + fpi->phy_node = ofdev->dev.of_node; > + } > + } WBR, Sergei