aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorVasiliy Kulikov <segoon@openwall.com>2010-11-26 12:06:12 -0500
committerHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-01-13 14:40:53 -0500
commit36b471e047a77eaf3ec8e693bd9d8291c4dfd864 (patch)
treeeaedd7ca560587611a34c0ff05503d2a129e956b /arch/avr32
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff)
avr32: boards: setup: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/boards/atngw100/setup.c2
-rw-r--r--arch/avr32/boards/atstk1000/atstk1002.c2
-rw-r--r--arch/avr32/boards/favr-32/setup.c2
-rw-r--r--arch/avr32/boards/hammerhead/setup.c2
-rw-r--r--arch/avr32/boards/merisc/setup.c2
-rw-r--r--arch/avr32/boards/mimc200/setup.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 8c6a2440e345..659d119ce712 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -188,7 +188,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
188 */ 188 */
189 regs = (void __iomem __force *)res->start; 189 regs = (void __iomem __force *)res->start;
190 pclk = clk_get(&pdev->dev, "pclk"); 190 pclk = clk_get(&pdev->dev, "pclk");
191 if (!pclk) 191 if (IS_ERR(pclk))
192 return; 192 return;
193 193
194 clk_enable(pclk); 194 clk_enable(pclk);
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 2adc261c9e3d..6ce30fb2ec94 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -203,7 +203,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
203 */ 203 */
204 regs = (void __iomem __force *)res->start; 204 regs = (void __iomem __force *)res->start;
205 pclk = clk_get(&pdev->dev, "pclk"); 205 pclk = clk_get(&pdev->dev, "pclk");
206 if (!pclk) 206 if (IS_ERR(pclk))
207 return; 207 return;
208 208
209 clk_enable(pclk); 209 clk_enable(pclk);
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 75f19f47fb2f..86fab77a5a00 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -206,7 +206,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
206 */ 206 */
207 regs = (void __iomem __force *)res->start; 207 regs = (void __iomem __force *)res->start;
208 pclk = clk_get(&pdev->dev, "pclk"); 208 pclk = clk_get(&pdev->dev, "pclk");
209 if (!pclk) 209 if (IS_ERR(pclk))
210 return; 210 return;
211 211
212 clk_enable(pclk); 212 clk_enable(pclk);
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index dd009875a405..da14fbdd4e8e 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -150,7 +150,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
150 regs = (void __iomem __force *)res->start; 150 regs = (void __iomem __force *)res->start;
151 pclk = clk_get(&pdev->dev, "pclk"); 151 pclk = clk_get(&pdev->dev, "pclk");
152 152
153 if (!pclk) 153 if (IS_ERR(pclk))
154 return; 154 return;
155 155
156 clk_enable(pclk); 156 clk_enable(pclk);
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 623b077594fc..e61bc948f959 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -134,7 +134,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
134 134
135 regs = (void __iomem __force *)res->start; 135 regs = (void __iomem __force *)res->start;
136 pclk = clk_get(&pdev->dev, "pclk"); 136 pclk = clk_get(&pdev->dev, "pclk");
137 if (!pclk) 137 if (IS_ERR(pclk))
138 return; 138 return;
139 139
140 clk_enable(pclk); 140 clk_enable(pclk);
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 523d8e183bef..c4da5cba2dbf 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -162,7 +162,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
162 */ 162 */
163 regs = (void __iomem __force *)res->start; 163 regs = (void __iomem __force *)res->start;
164 pclk = clk_get(&pdev->dev, "pclk"); 164 pclk = clk_get(&pdev->dev, "pclk");
165 if (!pclk) 165 if (IS_ERR(pclk))
166 return; 166 return;
167 167
168 clk_enable(pclk); 168 clk_enable(pclk);