From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/4] ARM: common/sa1111: remove NO_IRQ check
Date: Tue, 6 Sep 2016 15:14:32 +0100 [thread overview]
Message-ID: <20160906141432.GW1041@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20160906135637.2622666-1-arnd@arndb.de>
Please check other patches previously sent - these conflict with the
patch series I sent last week. This use is already gone.
On Tue, Sep 06, 2016 at 03:53:27PM +0200, Arnd Bergmann wrote:
> Since commit 489447380a29 ("[PATCH] handle errors returned by
> platform_get_irq*()") ten years ago, the sa1111 driver refuses to
> work without an interrupt line passed in its resources, so the
> check for NO_IRQ is unnecessary.
>
> I have also checked that all four machines files that register
> an sa1111 device (lubbock, badge4, journada720, and neponset)
> do set an interrupt line.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/common/sa1111.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index fb0a0a4dfea4..64d8cf08b7d0 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -751,11 +751,9 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
> * The interrupt controller must be initialised before any
> * other device to ensure that the interrupts are available.
> */
> - if (sachip->irq != NO_IRQ) {
> - ret = sa1111_setup_irq(sachip, pd->irq_base);
> - if (ret)
> - goto err_unmap;
> - }
> + ret = sa1111_setup_irq(sachip, pd->irq_base);
> + if (ret)
> + goto err_unmap;
>
> #ifdef CONFIG_ARCH_SA1100
> {
> @@ -834,12 +832,10 @@ static void __sa1111_remove(struct sa1111 *sachip)
> clk_disable(sachip->clk);
> clk_unprepare(sachip->clk);
>
> - if (sachip->irq != NO_IRQ) {
> - irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
> - irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
> + irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
> + irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
>
> - release_mem_region(sachip->phys + SA1111_INTC, 512);
> - }
> + release_mem_region(sachip->phys + SA1111_INTC, 512);
>
> iounmap(sachip->base);
> clk_put(sachip->clk);
> --
> 2.9.0
>
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
prev parent reply other threads:[~2016-09-06 14:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 13:53 [PATCH 1/4] ARM: common/sa1111: remove NO_IRQ check Arnd Bergmann
2016-09-06 13:53 ` [PATCH 2/4] ARM: common/locomo: " Arnd Bergmann
2016-09-06 14:21 ` Russell King - ARM Linux
2016-09-06 14:50 ` Arnd Bergmann
2016-09-06 15:20 ` [PATCH v2] " Arnd Bergmann
2016-09-06 13:53 ` [PATCH 3/4] mfd: ucb1x00: " Arnd Bergmann
2016-09-07 11:24 ` Lee Jones
2016-09-06 13:53 ` [PATCH 4/4] pcmcia: soc-common: remove incorrect NO_IRQ use Arnd Bergmann
2016-09-06 14:14 ` Russell King - ARM Linux [this message]
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=20160906141432.GW1041@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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).