* [PATCH] hisi_sas: use platform_get_irq()
@ 2015-12-10 15:02 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2015-12-10 15:02 UTC (permalink / raw)
To: JBottomley, martin.petersen
Cc: arnd, linuxarm, zhangfei.gao, xuwei5, john.garry2, linux-scsi,
linux-kernel, robh, John Garry
It is preferred that drivers use platform_get_irq()
instead of irq_of_parse_and_map(), so replace.
Signed-off-by: John Garry <john.garry@huawei.com>
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 89ae31d..e907758 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1673,19 +1673,16 @@ static irq_handler_t fatal_interrupts[HISI_SAS_MAX_QUEUES] = {
static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
{
- struct device *dev = &hisi_hba->pdev->dev;
- struct device_node *np = dev->of_node;
+ struct platform_device *pdev = hisi_hba->pdev;
+ struct device *dev = &pdev->dev;
int i, j, irq, rc, idx;
- if (!np)
- return -ENOENT;
-
for (i = 0; i < hisi_hba->n_phy; i++) {
struct hisi_sas_phy *phy = &hisi_hba->phy[i];
idx = i * HISI_SAS_PHY_INT_NR;
for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev,
"irq init: fail map phy interrupt %d\n",
@@ -1706,7 +1703,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = hisi_hba->n_phy * HISI_SAS_PHY_INT_NR;
for (i = 0; i < hisi_hba->queue_count; i++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev, "irq init: could not map cq interrupt %d\n",
idx);
@@ -1724,7 +1721,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count;
for (i = 0; i < HISI_SAS_FATAL_INT_NR; i++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev, "irq init: could not map fatal interrupt %d\n",
idx);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] hisi_sas: use platform_get_irq()
@ 2015-12-10 15:02 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2015-12-10 15:02 UTC (permalink / raw)
To: JBottomley, martin.petersen
Cc: arnd, linuxarm, zhangfei.gao, xuwei5, john.garry2, linux-scsi,
linux-kernel, robh, John Garry
It is preferred that drivers use platform_get_irq()
instead of irq_of_parse_and_map(), so replace.
Signed-off-by: John Garry <john.garry@huawei.com>
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 89ae31d..e907758 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1673,19 +1673,16 @@ static irq_handler_t fatal_interrupts[HISI_SAS_MAX_QUEUES] = {
static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
{
- struct device *dev = &hisi_hba->pdev->dev;
- struct device_node *np = dev->of_node;
+ struct platform_device *pdev = hisi_hba->pdev;
+ struct device *dev = &pdev->dev;
int i, j, irq, rc, idx;
- if (!np)
- return -ENOENT;
-
for (i = 0; i < hisi_hba->n_phy; i++) {
struct hisi_sas_phy *phy = &hisi_hba->phy[i];
idx = i * HISI_SAS_PHY_INT_NR;
for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev,
"irq init: fail map phy interrupt %d\n",
@@ -1706,7 +1703,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = hisi_hba->n_phy * HISI_SAS_PHY_INT_NR;
for (i = 0; i < hisi_hba->queue_count; i++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev, "irq init: could not map cq interrupt %d\n",
idx);
@@ -1724,7 +1721,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count;
for (i = 0; i < HISI_SAS_FATAL_INT_NR; i++, idx++) {
- irq = irq_of_parse_and_map(np, idx);
+ irq = platform_get_irq(pdev, idx);
if (!irq) {
dev_err(dev, "irq init: could not map fatal interrupt %d\n",
idx);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] hisi_sas: use platform_get_irq()
2015-12-10 15:02 ` John Garry
(?)
@ 2015-12-10 20:08 ` Rob Herring
2015-12-11 10:13 ` John Garry
-1 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2015-12-10 20:08 UTC (permalink / raw)
To: John Garry
Cc: James E.J. Bottomley, martin.petersen, Arnd Bergmann, Linuxarm,
Zhangfei Gao, Wei Xu, John Garry, linux-scsi,
linux-kernel@vger.kernel.org
On Thu, Dec 10, 2015 at 9:02 AM, John Garry <john.garry@huawei.com> wrote:
> It is preferred that drivers use platform_get_irq()
> instead of irq_of_parse_and_map(), so replace.
You may be able to stop including of_irq.h with this change. Otherwise,
Acked-by: Rob Herring <robh@kernel.org>
>
> Signed-off-by: John Garry <john.garry@huawei.com>
>
> diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
> index 89ae31d..e907758 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
> +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
> @@ -1673,19 +1673,16 @@ static irq_handler_t fatal_interrupts[HISI_SAS_MAX_QUEUES] = {
>
> static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
> {
> - struct device *dev = &hisi_hba->pdev->dev;
> - struct device_node *np = dev->of_node;
> + struct platform_device *pdev = hisi_hba->pdev;
> + struct device *dev = &pdev->dev;
> int i, j, irq, rc, idx;
>
> - if (!np)
> - return -ENOENT;
> -
> for (i = 0; i < hisi_hba->n_phy; i++) {
> struct hisi_sas_phy *phy = &hisi_hba->phy[i];
>
> idx = i * HISI_SAS_PHY_INT_NR;
> for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {
> - irq = irq_of_parse_and_map(np, idx);
> + irq = platform_get_irq(pdev, idx);
> if (!irq) {
> dev_err(dev,
> "irq init: fail map phy interrupt %d\n",
> @@ -1706,7 +1703,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
>
> idx = hisi_hba->n_phy * HISI_SAS_PHY_INT_NR;
> for (i = 0; i < hisi_hba->queue_count; i++, idx++) {
> - irq = irq_of_parse_and_map(np, idx);
> + irq = platform_get_irq(pdev, idx);
> if (!irq) {
> dev_err(dev, "irq init: could not map cq interrupt %d\n",
> idx);
> @@ -1724,7 +1721,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
>
> idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count;
> for (i = 0; i < HISI_SAS_FATAL_INT_NR; i++, idx++) {
> - irq = irq_of_parse_and_map(np, idx);
> + irq = platform_get_irq(pdev, idx);
> if (!irq) {
> dev_err(dev, "irq init: could not map fatal interrupt %d\n",
> idx);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hisi_sas: use platform_get_irq()
2015-12-10 20:08 ` Rob Herring
@ 2015-12-11 10:13 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2015-12-11 10:13 UTC (permalink / raw)
To: Rob Herring
Cc: James E.J. Bottomley, martin.petersen, Arnd Bergmann, Linuxarm,
Zhangfei Gao, Wei Xu, John Garry, linux-scsi,
linux-kernel@vger.kernel.org
On 10/12/2015 20:08, Rob Herring wrote:
> On Thu, Dec 10, 2015 at 9:02 AM, John Garry <john.garry@huawei.com> wrote:
>> It is preferred that drivers use platform_get_irq()
>> instead of irq_of_parse_and_map(), so replace.
>
> You may be able to stop including of_irq.h with this change. Otherwise,
>
Right, I don't think it is required any longer. I'll generate another patch.
Thanks,
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] hisi_sas: use platform_get_irq()
@ 2015-12-11 10:13 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2015-12-11 10:13 UTC (permalink / raw)
To: Rob Herring
Cc: James E.J. Bottomley, martin.petersen, Arnd Bergmann, Linuxarm,
Zhangfei Gao, Wei Xu, John Garry, linux-scsi,
linux-kernel@vger.kernel.org
On 10/12/2015 20:08, Rob Herring wrote:
> On Thu, Dec 10, 2015 at 9:02 AM, John Garry <john.garry@huawei.com> wrote:
>> It is preferred that drivers use platform_get_irq()
>> instead of irq_of_parse_and_map(), so replace.
>
> You may be able to stop including of_irq.h with this change. Otherwise,
>
Right, I don't think it is required any longer. I'll generate another patch.
Thanks,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-11 10:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-10 15:02 [PATCH] hisi_sas: use platform_get_irq() John Garry
2015-12-10 15:02 ` John Garry
2015-12-10 20:08 ` Rob Herring
2015-12-11 10:13 ` John Garry
2015-12-11 10:13 ` John Garry
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.