omap3: Check return values for clk_get()
PATCH v2 1/1 omap3: Check return values for clk_get()
This patch checks if clk_get() returned success for the clocks used in function omap2_clk_arch_init().
This version incorporates review comments from
Kevin Hilman and Paul Walmsley.
--- arch/arm/mach-omap2/clock34xx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock34xx.c +16 -0
@@ -21,6 +21,7 @@#include <linux/delay.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/err.h> #include <plat/cpu.h> #include <plat/clock.h>
@@ -184,6 +185,7 @@ static int __init omap3xxx_clk_arch_init(void) {struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck;unsigned long osc_sys_rate; +bool err =0 ;if (!cpu_is_omap34xx ())return 0 ;
@@ -193,9 +195,23 @@ static int __init omap3xxx_clk_arch_init(void)/* XXX test these for success */ dpll1_ck =clk_get (NULL ,"dpll1_ck" ); +if (WARN (IS_ERR (dpll1_ck),"Failed to get dpll1_ck.\n" )) + err =1 ; + arm_fck =clk_get (NULL ,"arm_fck" ); +if (WARN (IS_ERR (arm_fck),"Failed to get arm_fck.\n" )) + err =1 ; + core_ck =clk_get (NULL ,"core_ck" ); +if (WARN (IS_ERR (core_ck),"Failed to get core_ck.\n" )) + err =1 ; + osc_sys_ck =clk_get (NULL ,"osc_sys_ck" ); +if (WARN (IS_ERR (osc_sys_ck),"Failed to get osc_sys_ck.\n" )) + err =1 ; + +if (err) +return -ENOENT ;/* REVISIT: not yet ready for 343x */ if (clk_set_rate (dpll1_ck, mpurate))
Signature · 1 line
1.6.2.2
Quoted 7 lines · Sanjeev Premi
This patch checks if
clk_get()returned success for the clocks used in functionomap2_clk_arch_init().This version incorporates review comments from
Kevin Hilman and Paul Walmsley.Signed-off-by Sanjeev Premi <[email protected]>
Quoted 55 lines
--- arch/arm/mach-omap2/clock34xx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)arch/arm/mach-omap2/clock34xx.c +16
-0@@ -21,6 +21,7 @@#include <linux/delay.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/err.h> #include <plat/cpu.h> #include <plat/clock.h> @@ -184,6 +185,7 @@ static int __init omap3xxx_clk_arch_init(void) {struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck;unsigned long osc_sys_rate; +bool err =0 ;if (!cpu_is_omap34xx ())return 0 ;@@ -193,9 +195,23 @@ static int __init omap3xxx_clk_arch_init(void)/* XXX test these for success */ dpll1_ck =clk_get (NULL ,"dpll1_ck" ); +if (WARN (IS_ERR (dpll1_ck),"Failed to get dpll1_ck.\n" )) + err =1 ; + arm_fck =clk_get (NULL ,"arm_fck" ); +if (WARN (IS_ERR (arm_fck),"Failed to get arm_fck.\n" )) + err =1 ; + core_ck =clk_get (NULL ,"core_ck" ); +if (WARN (IS_ERR (core_ck),"Failed to get core_ck.\n" )) + err =1 ; + osc_sys_ck =clk_get (NULL ,"osc_sys_ck" ); +if (WARN (IS_ERR (osc_sys_ck),"Failed to get osc_sys_ck.\n" )) + err =1 ; + +if (err) +return -ENOENT ;/* REVISIT: not yet ready for 343x */ if (clk_set_rate (dpll1_ck, mpurate))Signature · 6 lines
1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Paul Walmsley
maintainerQuoted 7 lines · Sanjeev Premi
This patch checks if
clk_get()returned success for the clocks used in functionomap2_clk_arch_init().This version incorporates review comments from
Kevin Hilman and Paul Walmsley.Signed-off-by Sanjeev Premi <[email protected]>
Thanks, queued for 2.6.34 with one change:
arch/arm/mach-omap2/clock34xx.c static int __init omap3xxx_clk_arch_init(void) · line 188
Quoted 13 lines
--- arch/arm/mach-omap2/clock34xx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)arch/arm/mach-omap2/clock34xx.c +1
-0@@ -184,6 +185,7 @@ static int __init omap3xxx_clk_arch_init(void) {struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck;unsigned long osc_sys_rate; +bool err =0 ;
There should not be a space before the semicolon in the above line and so the space has been removed.
arch/arm/mach-omap2/clock34xx.c static int __init omap3xxx_clk_arch_init(void) · line 191
Quoted 3 lines
arch/arm/mach-omap2/clock34xx.c +0
-0if (!cpu_is_omap34xx ())return 0 ;
- Paul