lkml.org 
[lkml]   [2019]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 03/11] ARM: davinci: WARN_ON() if clk_get() fails
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    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>
    ---
    arch/arm/mach-davinci/da830.c | 4 ++++
    arch/arm/mach-davinci/da850.c | 4 ++++
    arch/arm/mach-davinci/dm355.c | 4 ++++
    arch/arm/mach-davinci/dm365.c | 4 ++++
    arch/arm/mach-davinci/dm644x.c | 4 ++++
    arch/arm/mach-davinci/dm646x.c | 4 ++++
    6 files changed, 24 insertions(+)

    diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
    index 63511f638ce4..d242ce06f7e5 100644
    --- a/arch/arm/mach-davinci/da830.c
    +++ b/arch/arm/mach-davinci/da830.c
    @@ -750,6 +750,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 67ab71ba3ad3..72d64d39d42a 100644
    --- a/arch/arm/mach-davinci/da850.c
    +++ b/arch/arm/mach-davinci/da850.c
    @@ -680,6 +680,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 4a482445b9a2..57c5a660758e 100644
    --- a/arch/arm/mach-davinci/dm355.c
    +++ b/arch/arm/mach-davinci/dm355.c
    @@ -742,6 +742,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 8e0a77315add..1d82bb630d11 100644
    --- a/arch/arm/mach-davinci/dm365.c
    +++ b/arch/arm/mach-davinci/dm365.c
    @@ -783,6 +783,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 cecc7ceb8d34..2b0e921aa755 100644
    --- a/arch/arm/mach-davinci/dm644x.c
    +++ b/arch/arm/mach-davinci/dm644x.c
    @@ -678,6 +678,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 f33392f77a03..7e5af984ed9f 100644
    --- a/arch/arm/mach-davinci/dm646x.c
    +++ b/arch/arm/mach-davinci/dm646x.c
    @@ -662,6 +662,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);
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-02-26 13:09    [W:3.747 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site