lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: setup timers in late_time_init()

Browse Source 
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>
This commit is contained in:
Magnus Damm
2009-04-28 08:19:50 +00:00
committed by Paul Mundt
parent 5b644c7a21
commit 8e0b842948
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/clocksource/sh_cmt.c
View File

@@ -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;