[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20161209105040.GH3625@dell.home>
Date: Fri, 9 Dec 2016 10:50:40 +0000
From: Lee Jones <lee.jones@...aro.org>
To: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org, patches@...nsource.wolfsonmicro.com
Subject: Re: [PATCH v2 2/4] mfd: arizona: Use arizona_map_irq instead of hard
coding it
On Tue, 22 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@...nsource.wolfsonmicro.com>
> ---
>
> Changes since v1:
> - Just a rebase
>
> Thanks,
> Charles
>
> drivers/mfd/arizona-irq.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
Applied for v4.11, thanks.
> diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
> index 2e01975..724fa54 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;
>
> @@ -368,9 +368,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);
> @@ -379,10 +378,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",
> @@ -394,7 +392,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:
> @@ -410,9 +408,9 @@ int arizona_irq_init(struct arizona *arizona)
> int arizona_irq_exit(struct arizona *arizona)
> {
> 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);
> +
> regmap_del_irq_chip(irq_find_mapping(arizona->virq, 1),
> arizona->irq_chip);
> regmap_del_irq_chip(irq_find_mapping(arizona->virq, 0),
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Powered by blists - more mailing lists