Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1412715

[PATCH v4 net-next 06/13] net: hns: use platform_get_irq instead of irq_of_parse_and_map

Path csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From Yisen Zhuang <Yisen.Zhuang@huawei.com>
Newsgroups linux.kernel
Subject [PATCH v4 net-next 06/13] net: hns: use platform_get_irq instead of irq_of_parse_and_map
Date Fri, 03 Jun 2016 04:50:02 +0200
Message-ID <rFNlo-5RH-7@gated-at.bofh.it> (permalink)
References <rFNbH-5NL-3@gated-at.bofh.it>
X-Mailer git-send-email 1.9.1
MIME-Version 1.0
Content-Type text/plain
X-Originating-IP [10.67.212.75]
X-Cfilter-Loop Reflected
X-Mirapoint-Virus-Rapid-Raw score=unknown(0), refid=str=0001.0A020202.5750ED40.00DB,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-ID f89ccb9525bd7c77cee54e4eab618f72
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 38
Organization linux.* mail to news gateway
X-Original-Cc <fengguang.wu@intel.com>, <andriy.shevchenko@linux.intel.com>, <andrew@lunn.ch>, <ivecera@redhat.com>, <f.fainelli@gmail.com>, <haifeng.wei@huawei.com>, <charles.chenxin@huawei.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-acpi@vger.kernel.org>, <linuxarm@huawei.com>
X-Original-Date Fri, 3 Jun 2016 10:55:14 +0800
X-Original-Message-ID <1464922521-30928-7-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-References <1464922521-30928-1-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1412715

Show key headers only | View raw


From: Kejian Yan <yankejian@huawei.com>

As irq_of_parse_and_map is only used by DT case, it is excepted to use
a uniform interface. So it is used platform_get_irq() instead.

Signed-off-by: Kejian Yan <yankejian@huawei.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 4ef6d23..3ce2409 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -458,7 +458,6 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
 	u32 i;
 	u32 ring_num = rcb_common->ring_num;
 	int base_irq_idx = hns_rcb_get_base_irq_idx(rcb_common);
-	struct device_node *np = rcb_common->dsaf_dev->dev->of_node;
 	struct platform_device *pdev =
 		to_platform_device(rcb_common->dsaf_dev->dev);
 	bool is_ver1 = AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver);
@@ -473,10 +472,10 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
 		ring_pair_cb->port_id_in_comm =
 			hns_rcb_get_port_in_comm(rcb_common, i);
 		ring_pair_cb->virq[HNS_RCB_IRQ_IDX_TX] =
-		is_ver1 ? irq_of_parse_and_map(np, base_irq_idx + i * 2) :
+		is_ver1 ? platform_get_irq(pdev, base_irq_idx + i * 2) :
 			  platform_get_irq(pdev, base_irq_idx + i * 3 + 1);
 		ring_pair_cb->virq[HNS_RCB_IRQ_IDX_RX] =
-		is_ver1 ? irq_of_parse_and_map(np, base_irq_idx + i * 2 + 1) :
+		is_ver1 ? platform_get_irq(pdev, base_irq_idx + i * 2 + 1) :
 			  platform_get_irq(pdev, base_irq_idx + i * 3);
 		ring_pair_cb->q.phy_base =
 			RCB_COMM_BASE_TO_RING_BASE(rcb_common->phy_base, i);
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v4 net-next 00/13] net: hns: add support of ACPI Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-03 04:50 +0200
  [PATCH v4 net-next 06/13] net: hns: use platform_get_irq instead of irq_of_parse_and_map Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-03 04:50 +0200
  [PATCH v4 net-next 04/13] net: hisilicon: add support of acpi for hns-mdio Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-03 04:50 +0200
  [PATCH v4 net-next 09/13] net: hns: add dsaf misc operation method Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-03 04:50 +0200
  Re: [PATCH v4 net-next 00/13] net: hns: add support of ACPI "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-06-03 23:40 +0200
    Re: [PATCH v4 net-next 00/13] net: hns: add support of ACPI David Miller <davem@davemloft.net> - 2016-06-04 02:00 +0200
  Re: [PATCH v4 net-next 00/13] net: hns: add support of ACPI David Miller <davem@davemloft.net> - 2016-06-05 04:20 +0200

csiph-web