From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754828AbbLKL4x (ORCPT ); Fri, 11 Dec 2015 06:56:53 -0500 Received: from mx2.suse.de ([195.135.220.15]:54759 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902AbbLKL4v (ORCPT ); Fri, 11 Dec 2015 06:56:51 -0500 Date: Fri, 11 Dec 2015 12:56:43 +0100 From: Johannes Thumshirn To: John Garry Cc: JBottomley@odin.com, martin.petersen@oracle.com, arnd@arndb.de, linuxarm@huawei.com, zhangfei.gao@linaro.org, xuwei5@hisilicon.com, john.garry2@mail.dcu.ie, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, robh@kernel.org Subject: Re: [PATCH v2] hisi_sas: use platform_get_irq() Message-ID: <20151211115643.GA31151@c203.arch.suse.de> References: <1449835401-200442-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1449835401-200442-1-git-send-email-john.garry@huawei.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 11, 2015 at 08:03:21PM +0800, John Garry wrote: > It is preferred that drivers use platform_get_irq() > instead of irq_of_parse_and_map(), so replace. > > Signed-off-by: John Garry > Acked-by: Rob Herring > > diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h > index 30a9ab9..5af2e41 100644 > --- a/drivers/scsi/hisi_sas/hisi_sas.h > +++ b/drivers/scsi/hisi_sas/hisi_sas.h > @@ -16,7 +16,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c > index 0ed2f92..d543811 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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Johannes Thumshirn -- Johannes Thumshirn Storage jthumshirn@suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850