ARM: davinci: WARN_ON() if clk_get() fails

Currently the timer code checks if the clock pointer passed to it is
good (!IS_ERR(clk)). The new clocksource driver expects the clock to
be functional and doesn't perform any checks so emit a warning if
clk_get() fails. Apply this to all davinci platforms.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index e6b8ffd934a114c9a0654749c61592671e301d68..220e99438ae024da137f61ffaa5ba59fe7a25100 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -751,6 +751,10 @@ void __init da830_init_time(void)
        da830_pll_init(NULL, pll, NULL);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 77bc64d6e39be1eb5b2751d88315cf3caf341269..dcf3536c46bca1b9e86ac1d8531934cba08833f9 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -681,6 +681,10 @@ void __init da850_init_time(void)
        da850_pll0_init(NULL, pll0, cfgchip);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index c6073326be2e16cff3488c4c7cd064e679773f3b..a38a3648345ba036fe5240b9c2be1ef724d9e986 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -743,6 +743,10 @@ void __init dm355_init_time(void)
        dm355_psc_init(NULL, psc);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 2f9ae6431bf54d627aeecaf7d941db998466f7ea..8062412be70f06dc8d252ca45f9f5ff86bba262e 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -784,6 +784,10 @@ void __init dm365_init_time(void)
        dm365_psc_init(NULL, psc);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 1b9e9a6192ef181f22c7b92f05872cabfae13338..7a6b5a48cae58fe815b69bda776b2ade97b57882 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -679,6 +679,10 @@ void __init dm644x_init_time(void)
        dm644x_psc_init(NULL, psc);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 62ca952fe1613ba125ffbe37f1bac89d9dedf8af..97fe533726e96904c5491386e6f813f1299fbd92 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -663,6 +663,10 @@ void __init dm646x_init_time(unsigned long ref_clk_rate,
        dm646x_psc_init(NULL, psc);
 
        clk = clk_get(NULL, "timer0");
+       if (WARN_ON(IS_ERR(clk))) {
+               pr_err("Unable to get the timer clock\n");
+               return;
+       }
 
        davinci_timer_init(clk);
 }