linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: linux@maxim.org.za, Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Boris Brezillon <boris@free-electrons.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Thomas Petazzoni <thomas@free-electrons.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH 08/13] AT91: PIT: use request_irq instead of setup_irq
Date: Wed, 25 Jun 2014 15:06:40 +0200	[thread overview]
Message-ID: <1403701605-26678-9-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1403701605-26678-1-git-send-email-maxime.ripard@free-electrons.com>

We can use the generic request_irq now to register a timer interrupt handler,
instead of the more complex setup_irq.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/mach-at91/at91sam926x_time.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 5423894bb0fc..9678ac391a81 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -173,16 +173,10 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
 	return IRQ_NONE;
 }
 
-static struct irqaction at91sam926x_pit_irq = {
-	.name		= "at91_tick",
-	.flags		= IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-	.handler	= at91sam926x_pit_interrupt,
-};
-
 /*
  * Set up both clocksource and clockevent support.
  */
-static void __init at91sam926x_pit_common_init(void)
+static void __init at91sam926x_pit_common_init(unsigned int pit_irq)
 {
 	unsigned long	pit_rate;
 	unsigned	bits;
@@ -208,7 +202,9 @@ static void __init at91sam926x_pit_common_init(void)
 	clocksource_register_hz(&pit_clk, pit_rate);
 
 	/* Set up irq handler */
-	ret = setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);
+	ret = request_irq(pit_irq, at91sam926x_pit_interrupt,
+			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+			  "at91_tick", pit_base_addr);
 	if (ret)
 		panic(pr_fmt("Unable to setup IRQ\n"));
 
@@ -239,9 +235,7 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
 	if (!irq)
 		panic(pr_fmt("Unable to get IRQ from DT\n"));
 
-	at91sam926x_pit_irq.irq = irq;
-
-	at91sam926x_pit_common_init();
+	at91sam926x_pit_common_init(irq);
 }
 CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
 		       at91sam926x_pit_dt_init);
@@ -252,9 +246,7 @@ void __init at91sam926x_pit_init(void)
 	if (IS_ERR(mck))
 		panic(pr_fmt("Unable to get mck clk\n"));
 
-	at91sam926x_pit_irq.irq = NR_IRQS_LEGACY + AT91_ID_SYS;
-
-	at91sam926x_pit_common_init();
+	at91sam926x_pit_common_init(NR_IRQS_LEGACY + AT91_ID_SYS);
 }
 
 void __init at91sam926x_ioremap_pit(u32 addr)
-- 
2.0.0


  parent reply	other threads:[~2014-06-25 13:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-25 13:06 [PATCH 00/13] AT91: PIT: Cleanups and move to drivers/clocksource Maxime Ripard
2014-06-25 13:06 ` [PATCH 01/13] AT91: PIT: Follow the general coding rules Maxime Ripard
2014-06-25 13:06 ` [PATCH 02/13] AT91: generic.h: Add include safe guards Maxime Ripard
2014-06-25 13:06 ` [PATCH 03/13] AT91: PIT: Use of_have_populated_dt instead of CONFIG_OF Maxime Ripard
2014-06-25 13:06 ` [PATCH 04/13] AT91: PIT: Rework probe functions Maxime Ripard
2014-06-25 13:06 ` [PATCH 05/13] AT91: dt: Remove init_time definitions Maxime Ripard
2014-06-25 13:06 ` [PATCH 06/13] AT91: PIT: Use consistent exit path in probe Maxime Ripard
2014-06-25 13:06 ` [PATCH 07/13] AT91: PIT: Use pr_fmt Maxime Ripard
2014-06-25 13:06 ` Maxime Ripard [this message]
2014-06-25 13:06 ` [PATCH 09/13] AT91: PIT: (Almost) remove the global variables Maxime Ripard
2014-06-26  5:12   ` Boris BREZILLON
2014-06-26  9:28     ` Maxime Ripard
2014-06-25 13:06 ` [PATCH 10/13] AT91: soc: Add init_time callback Maxime Ripard
2014-06-25 13:06 ` [PATCH 11/13] AT91: Convert the boards to the " Maxime Ripard
2014-06-25 13:06 ` [PATCH 12/13] AT91: PIT: Convert to an early_platform_device Maxime Ripard
2014-06-25 13:06 ` [PATCH 13/13] AT91: PIT: Move the driver to drivers/clocksource Maxime Ripard
2014-06-26  5:26   ` Boris BREZILLON
2014-06-26  9:30     ` Maxime Ripard
2014-06-26 11:48       ` Boris BREZILLON
2014-06-26 12:54         ` Maxime Ripard
2014-06-26  5:30 ` [PATCH 00/13] AT91: PIT: Cleanups and move " Boris BREZILLON

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=1403701605-26678-9-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris@free-electrons.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@maxim.org.za \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=thomas@free-electrons.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).