From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753122AbcEMNAP (ORCPT ); Fri, 13 May 2016 09:00:15 -0400 Received: from mga04.intel.com ([192.55.52.120]:11837 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751407AbcEMNAN (ORCPT ); Fri, 13 May 2016 09:00:13 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,614,1455004800"; d="scan'208";a="805554373" Message-ID: <1463144478.17131.338.camel@linux.intel.com> Subject: Re: [patch net-next 04/11] net: hns: enet specify a reference to dsaf by fwnode_handle From: Andy Shevchenko To: Yisen Zhuang , davem@davemloft.net, rjw@rjwysocki.net, lenb@kernel.org Cc: arnd@arndb.de, andrew@lunn.ch, geliangtang@163.com, ivecera@redhat.com, fengguang.wu@intel.com, charles.chenxin@huawei.com, haifeng.wei@huawei.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com Date: Fri, 13 May 2016 16:01:18 +0300 In-Reply-To: <1463127557-90824-5-git-send-email-Yisen.Zhuang@huawei.com> References: <1463127557-90824-1-git-send-email-Yisen.Zhuang@huawei.com> <1463127557-90824-5-git-send-email-Yisen.Zhuang@huawei.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2016-05-13 at 16:19 +0800, Yisen Zhuang wrote: > From: Kejian Yan > > As device_node is only used by OF case, it is expected to find uniform > ways. So fwnode_handle is the suitable method. Yeah, and this is part of conversion to fwnode, see previous comment. > > Signed-off-by: Kejian Yan > Signed-off-by: Yisen Zhuang > --- >  drivers/net/ethernet/hisilicon/hns/hnae.c     | 18 ++++++++++++------ >  drivers/net/ethernet/hisilicon/hns/hnae.h     |  3 ++- >  drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++++------- >  drivers/net/ethernet/hisilicon/hns/hns_enet.h |  2 +- >  4 files changed, 23 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c > b/drivers/net/ethernet/hisilicon/hns/hnae.c > index 3bfe36f..b5bf12a 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hnae.c > +++ b/drivers/net/ethernet/hisilicon/hns/hnae.c > @@ -96,16 +96,22 @@ static int __ae_match(struct device *dev, const > void *data) >  { >   struct hnae_ae_dev *hdev = cls_to_ae_dev(dev); >   > - return hdev->dev->of_node == data; > + if (IS_ENABLED(CONFIG_OF) && hdev->dev->of_node) > + return (data == &hdev->dev->of_node->fwnode); > + else if (ACPI_COMPANION(hdev->dev)) > + return (data == hdev->dev->fwnode); > + > + dev_err(dev, "__ae_match cannot read cfg data from OF or > acpi\n"); > + return 0; >  } >   > -static struct hnae_ae_dev *find_ae(const struct device_node *ae_node) > +static struct hnae_ae_dev *find_ae(const struct fwnode_handle > *fwnode) >  { >   struct device *dev; >   > - WARN_ON(!ae_node); > + WARN_ON(!fwnode); >   > - dev = class_find_device(hnae_class, NULL, ae_node, > __ae_match); > + dev = class_find_device(hnae_class, NULL, fwnode, > __ae_match); >   >   return dev ? cls_to_ae_dev(dev) : NULL; >  } > @@ -312,7 +318,7 @@ EXPORT_SYMBOL(hnae_reinit_handle); >   * return handle ptr or ERR_PTR >   */ >  struct hnae_handle *hnae_get_handle(struct device *owner_dev, > -     const struct device_node > *ae_node, > +     const struct fwnode_handle > *fwnode, >       u32 port_id, >       struct hnae_buf_ops *bops) >  { > @@ -321,7 +327,7 @@ struct hnae_handle *hnae_get_handle(struct device > *owner_dev, >   int i, j; >   int ret; >   > - dev = find_ae(ae_node); > + dev = find_ae(fwnode); >   if (!dev) >   return ERR_PTR(-ENODEV); >   > diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h > b/drivers/net/ethernet/hisilicon/hns/hnae.h > index e8d36aa..3ad3e55 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hnae.h > +++ b/drivers/net/ethernet/hisilicon/hns/hnae.h > @@ -27,6 +27,7 @@ >   * "cb" means control block >   */ >   > +#include >  #include >  #include >  #include > @@ -528,7 +529,7 @@ struct hnae_handle { >  #define ring_to_dev(ring) ((ring)->q->dev->dev) >   >  struct hnae_handle *hnae_get_handle(struct device *owner_dev, > -     const struct device_node > *ae_node, > +     const struct fwnode_handle > *fwnode, >       u32 port_id, >       struct hnae_buf_ops *bops); >   > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c > b/drivers/net/ethernet/hisilicon/hns/hns_enet.c > index 8851420..4fa9c21 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c > +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c > @@ -1807,7 +1807,7 @@ static int hns_nic_try_get_ae(struct net_device > *ndev) >   int ret; >   >   h = hnae_get_handle(&priv->netdev->dev, > -     priv->ae_node, priv->port_id, NULL); > +     priv->fwnode, priv->port_id, NULL); >   if (IS_ERR_OR_NULL(h)) { >   ret = -ENODEV; >   dev_dbg(priv->dev, "has not handle, register > notifier!\n"); > @@ -1867,7 +1867,7 @@ static int hns_nic_dev_probe(struct > platform_device *pdev) >   struct device *dev = &pdev->dev; >   struct net_device *ndev; >   struct hns_nic_priv *priv; > - struct device_node *node = dev->of_node; > + struct device_node *ae_node; >   u32 port_id; >   int ret; >   > @@ -1881,18 +1881,19 @@ static int hns_nic_dev_probe(struct > platform_device *pdev) >   priv->dev = dev; >   priv->netdev = ndev; >   > - if (of_device_is_compatible(node, "hisilicon,hns-nic-v1")) > + if (of_device_is_compatible(dev->of_node, "hisilicon,hns-nic- > v1")) >   priv->enet_ver = AE_VERSION_1; >   else >   priv->enet_ver = AE_VERSION_2; >   > - priv->ae_node = (void *)of_parse_phandle(node, "ae-handle", > 0); > - if (IS_ERR_OR_NULL(priv->ae_node)) { > - ret = PTR_ERR(priv->ae_node); > + ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); > + if (IS_ERR_OR_NULL(ae_node)) { > + ret = PTR_ERR(ae_node); >   dev_err(dev, "not find ae-handle\n"); >   goto out_read_prop_fail; >   } > - /* try to find port-idx-in-ae first */ > + priv->fwnode = &ae_node->fwnode; > + >   ret = device_property_read_u32(dev, "port-idx-in-ae", > &port_id); >   if (ret) { >   /* only for old code compatible */ > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h > b/drivers/net/ethernet/hisilicon/hns/hns_enet.h > index 337efa5..44bb301 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h > +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h > @@ -54,7 +54,7 @@ struct hns_nic_ops { >  }; >   >  struct hns_nic_priv { > - const struct device_node *ae_node; > + const struct fwnode_handle      *fwnode; >   u32 enet_ver; >   u32 port_id; >   int phy_mode; -- Andy Shevchenko Intel Finland Oy