Skip to contentSkip to conversation

arm: plat-spear: time: use IS_ERR() instead of NULL check

PATCH In review Vasiliy Kulikov 2 participants 2 messages Nov 26, 2010 – Nov 29, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: plat-spear: time: use IS_ERR() instead of NULL check

clk_get() returns ERR_PTR() on error, not NULL.

---
Cannot compile this driver, so it is not tested at all.

 arch/arm/plat-spear/time.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-spear/time.c +2 -2
index ab21165..678df18 100644
@@ -229,13 +229,13 @@ void __init spear_setup_timer(void)
 	}
 
 	gpt_clk = clk_get_sys("gpt0", NULL);
-	if (!gpt_clk) {
+	if (IS_ERR(gpt_clk)) {
 		pr_err("%s:couldn't get clk for gpt\n", __func__);
 		goto err_iomap;
 	}
 
 	pll3_clk = clk_get(NULL, "pll3_48m_clk");
-	if (!pll3_clk) {
+	if (IS_ERR(pll3_clk)) {
 		pr_err("%s:couldn't get PLL3 as parent for gpt\n", __func__);
 		goto err_iomap;
 	}
Signature · 1 line
1.7.0.4
Acked-by on v1 1/1
#1 lore raw
Quoted 19 lines · Vasiliy Kulikov

clk_get() returns ERR_PTR() on error, not NULL.

---
?Cannot compile this driver, so it is not tested at all.

?arch/arm/plat-spear/time.c | ? ?4 ++--
?1 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/plat-spear/time.c +1 -1
index ab21165..678df18 100644
@@ -229,13 +229,13 @@ void __init spear_setup_timer(void)
 ? ? ? ?}
 
 ? ? ? ?gpt_clk = clk_get_sys("gpt0", NULL);
- ? ? ? if (!gpt_clk) {
+ ? ? ? if (IS_ERR(gpt_clk)) {

arch/arm/plat-spear/time.c void __init spear_setup_timer(void) · line 241

Quoted 10 lines
arch/arm/plat-spear/time.c +1 -1
 ? ? ? ? ? ? ? ?pr_err("%s:couldn't get clk for gpt\n", __func__);
 ? ? ? ? ? ? ? ?goto err_iomap;
 ? ? ? ?}
 
 ? ? ? ?pll3_clk = clk_get(NULL, "pll3_48m_clk");
- ? ? ? if (!pll3_clk) {
+ ? ? ? if (IS_ERR(pll3_clk)) {
 ? ? ? ? ? ? ? ?pr_err("%s:couldn't get PLL3 as parent for gpt\n", __func__);
 ? ? ? ? ? ? ? ?goto err_iomap;
 ? ? ? ?}

Compiled & tested.