diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-04-28 08:19:50 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-28 18:01:25 +0900 |
| commit | 8e0b842948156e3463879caed12b4ce51bed772e (patch) | |
| tree | 0c5e01d3103e886a89e5663ac02552e04472f8d3 /drivers/clocksource | |
| parent | 5b644c7a218702668d7b610994e7dcbc3d4705d3 (diff) | |
| download | linux-stable-8e0b842948156e3463879caed12b4ce51bed772e.tar.gz linux-stable-8e0b842948156e3463879caed12b4ce51bed772e.tar.bz2 linux-stable-8e0b842948156e3463879caed12b4ce51bed772e.zip | |
sh: setup timers in late_time_init()
This patch moves the SuperH timer setup code from time_init()
to late_time_init(). Good things about this change:
- interrupts: they are enabled at late_time_init()
- mm: regular kmalloc() can be used at late_time_init()
Together with moving to late_time_init() this patch changes
the sh_cmt driver to always allocate with kmalloc(). This
simplifies the code a bit and also fixes section mismatches.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index d607ac2d516b..bf3e4c11fd37 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -18,7 +18,6 @@ */ #include <linux/init.h> -#include <linux/bootmem.h> #include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/interrupt.h> @@ -645,11 +644,7 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev) return 0; } - if (is_early_platform_device(pdev)) - p = alloc_bootmem(sizeof(*p)); - else - p = kmalloc(sizeof(*p), GFP_KERNEL); - + p = kmalloc(sizeof(*p), GFP_KERNEL); if (p == NULL) { dev_err(&pdev->dev, "failed to allocate driver data\n"); return -ENOMEM; @@ -657,11 +652,7 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev) ret = sh_cmt_setup(p, pdev); if (ret) { - if (is_early_platform_device(pdev)) - free_bootmem(__pa(p), sizeof(*p)); - else - kfree(p); - + kfree(p); platform_set_drvdata(pdev, NULL); } return ret; |