From: Lee Jones <lee.jones@linaro.org>
To: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
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
Date: Tue, 22 Nov 2016 15:54:36 +0000 [thread overview]
Message-ID: <20161122155436.GF10134@dell.home> (raw)
In-Reply-To: <20161122130130.GC316@dell.lan>
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 <ckeepax@opensource.wolfsonmicro.com>
> > ---
> > 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
next prev parent reply other threads:[~2016-11-22 15:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 17:15 [PATCH v2 1/3] mfd: arizona: Correctly clean up after IRQs Charles Keepax
2016-11-14 17:15 ` [PATCH 2/3] mfd: arizona: Disable IRQs during driver remove Charles Keepax
2016-11-22 12:59 ` Lee Jones
2016-11-14 17:15 ` [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Charles Keepax
2016-11-22 13:01 ` Lee Jones
2016-11-22 15:54 ` Lee Jones [this message]
2016-11-22 16:07 ` Charles Keepax
2016-11-22 12:57 ` [PATCH v2 1/3] mfd: arizona: Correctly clean up after IRQs Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161122155436.GF10134@dell.home \
--to=lee.jones@linaro.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).