From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945AbcKVPvn (ORCPT ); Tue, 22 Nov 2016 10:51:43 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37612 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932631AbcKVPvl (ORCPT ); Tue, 22 Nov 2016 10:51:41 -0500 Date: Tue, 22 Nov 2016 15:54:36 +0000 From: Lee Jones To: Charles Keepax Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Message-ID: <20161122155436.GF10134@dell.home> References: <1479143757-30531-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1479143757-30531-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> <20161122130130.GC316@dell.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161122130130.GC316@dell.lan> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Nov 2016, Lee Jones wrote: > On Mon, 14 Nov 2016, Charles Keepax wrote: > > > We have arizona_map_irq we might as well use it rather than hard coding > > it in several places. > > > > Signed-off-by: Charles Keepax > > --- > > drivers/mfd/arizona-irq.c | 21 +++++++++------------ > > 1 file changed, 9 insertions(+), 12 deletions(-) > > Applied, thanks. Slight change of plan. Patch doesn't seem to apply. Please rebase it on top of my MFD tree and resubmit. > > diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c > > index bc3b342..22f96c9 100644 > > --- a/drivers/mfd/arizona-irq.c > > +++ b/drivers/mfd/arizona-irq.c > > @@ -204,7 +204,7 @@ static const struct irq_domain_ops arizona_domain_ops = { > > int arizona_irq_init(struct arizona *arizona) > > { > > int flags = IRQF_ONESHOT; > > - int ret, i; > > + int ret; > > const struct regmap_irq_chip *aod, *irq; > > struct irq_data *irq_data; > > unsigned int virq; > > @@ -379,9 +379,8 @@ int arizona_irq_init(struct arizona *arizona) > > } > > > > /* Make sure the boot done IRQ is unmasked for resumes */ > > - i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE); > > - ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT, > > - "Boot done", arizona); > > + ret = arizona_request_irq(arizona, ARIZONA_IRQ_BOOT_DONE, "Boot done", > > + arizona_boot_done, arizona); > > if (ret != 0) { > > dev_err(arizona->dev, "Failed to request boot done %d: %d\n", > > arizona->irq, ret); > > @@ -390,10 +389,9 @@ int arizona_irq_init(struct arizona *arizona) > > > > /* Handle control interface errors in the core */ > > if (arizona->ctrlif_error) { > > - i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR); > > - ret = request_threaded_irq(i, NULL, arizona_ctrlif_err, > > - IRQF_ONESHOT, > > - "Control interface error", arizona); > > + ret = arizona_request_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, > > + "Control interface error", > > + arizona_ctrlif_err, arizona); > > if (ret != 0) { > > dev_err(arizona->dev, > > "Failed to request CTRLIF_ERR %d: %d\n", > > @@ -405,7 +403,7 @@ int arizona_irq_init(struct arizona *arizona) > > return 0; > > > > err_ctrlif: > > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona); > > + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona); > > err_boot_done: > > free_irq(arizona->irq, arizona); > > err_main_irq: > > @@ -429,9 +427,8 @@ int arizona_irq_exit(struct arizona *arizona) > > unsigned int virq; > > > > if (arizona->ctrlif_error) > > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR), > > - arizona); > > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona); > > + arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona); > > + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona); > > > > virq = irq_find_mapping(arizona->virq, 1); > > regmap_del_irq_chip(virq, arizona->irq_chip); > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog