Patchwork : ppc: notifier_from_errno() cleanup

login
register
mail settings
Submitter Prarit Bhargava
Date Jan. 13, 2011, 2:09 p.m.
Message ID <20110113140901.1415.69539.sendpatchset@prarit.bos.redhat.com>
Download mbox | patch
Permalink /patch/78760/
State Accepted
Commit 7e26065d8b11babc948262b92cd989fcc7062653
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Prarit Bhargava - Jan. 13, 2011, 2:09 p.m.
Minor cleanup of notifier_from_errno() in powerpc.

notifier_from_errno() now contains the if(ret)/else conditional.  There is no
need to do it in the powerpc code.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

Patch

diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index f480386..3cafc30 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -508,12 +508,7 @@  static int cmm_memory_isolate_cb(struct notifier_block *self,
 	if (action == MEM_ISOLATE_COUNT)
 		ret = cmm_count_pages(arg);
 
-	if (ret)
-		ret = notifier_from_errno(ret);
-	else
-		ret = NOTIFY_OK;
-
-	return ret;
+	return notifier_from_errno(ret);
 }
 
 static struct notifier_block cmm_mem_isolate_nb = {
@@ -635,12 +630,7 @@  static int cmm_memory_cb(struct notifier_block *self,
 		break;
 	}
 
-	if (ret)
-		ret = notifier_from_errno(ret);
-	else
-		ret = NOTIFY_OK;
-
-	return ret;
+	return notifier_from_errno(ret);
 }
 
 static struct notifier_block cmm_mem_nb = {