linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] clocksource: bcm2835: use the device_node pointer passed to init
Date: Thu,  7 Feb 2013 13:09:02 -0600	[thread overview]
Message-ID: <1360264144-20714-3-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1360264144-20714-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

We've already matched the node, so use the node pointer passed in.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/clocksource/bcm2835_timer.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index 50c68fe..766611d 100644
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -95,23 +95,13 @@ static irqreturn_t bcm2835_time_interrupt(int irq, void *dev_id)
 	}
 }
 
-static struct of_device_id bcm2835_time_match[] __initconst = {
-	{ .compatible = "brcm,bcm2835-system-timer" },
-	{}
-};
-
-static void __init bcm2835_timer_init(void)
+static void __init bcm2835_timer_init(struct device_node *node)
 {
-	struct device_node *node;
 	void __iomem *base;
 	u32 freq;
 	int irq;
 	struct bcm2835_timer *timer;
 
-	node = of_find_matching_node(NULL, bcm2835_time_match);
-	if (!node)
-		panic("No bcm2835 timer node");
-
 	base = of_iomap(node, 0);
 	if (!base)
 		panic("Can't remap registers");
-- 
1.7.10.4

  parent reply	other threads:[~2013-02-07 19:09 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-07 19:09 [PATCH 0/4] Improve CLKSRC_OF matching Rob Herring
2013-02-07 19:09 ` [PATCH 1/4] clocksource: pass DT node pointer to init functions Rob Herring
2013-02-13 16:21   ` Michal Simek
2013-02-13 16:33     ` Rob Herring
2013-02-13 17:33       ` Michal Simek
2013-02-14  1:30         ` Rob Herring
2013-02-14  6:45           ` Michal Simek
2013-02-14 14:22             ` Rob Herring
2013-02-07 19:09 ` Rob Herring [this message]
2013-02-09  3:47   ` [PATCH 2/4] clocksource: bcm2835: use the device_node pointer passed to init Stephen Warren
2013-02-07 19:09 ` [PATCH 3/4] clocksource: vt8500: " Rob Herring
2013-02-07 19:09 ` [PATCH 4/4] clocksource: tegra20: " Rob Herring
2013-02-07 19:39   ` Stephen Warren
2013-02-07 20:05     ` Hiroshi Doyu
2013-02-07 22:44 ` [PATCH 0/4] Improve CLKSRC_OF matching Arnd Bergmann
2013-02-07 23:36   ` Rob Herring
2013-02-07 23:45     ` Arnd Bergmann
2013-02-08  4:51 ` Tony Prisk
2013-02-08 13:07   ` Rob Herring

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=1360264144-20714-3-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.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).