ARM: cleanup: pwrdm_can_ever_lose_context() checking

Russell King · Russell King · commit 62f0f39b4aa2 · 2013-02-24T10:55:24.000Z
pwrdm_can_ever_lose_context() is only ever called from the OMAP GPIO
code, and only with a pointer returned from omap_hwmod_get_pwrdm().
omap_hwmod_get_pwrdm() only ever returns NULL on error, so using
IS_ERR_OR_NULL() to validate the passed pointer is silly.  Use a
simpler !ptr check instead.

Signed-off-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
@@ -1054,7 +1054,7 @@ bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm)
 {
 	int i;
 
-	if (IS_ERR_OR_NULL(pwrdm)) {
+	if (!pwrdm) {
 		pr_debug("powerdomain: %s: invalid powerdomain pointer\n",
 			 __func__);
 		return 1;

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm)`
`1054`	`1054`	`{`
`1055`	`1055`	`int i;`
`1056`	`1056`
`1057`		`- if (IS_ERR_OR_NULL(pwrdm)) {`
	`1057`	`+ if (!pwrdm) {`
`1058`	`1058`	`pr_debug("powerdomain: %s: invalid powerdomain pointer\n",`
`1059`	`1059`	`__func__);`
`1060`	`1060`	`return 1;`