mm: notifier_from_errno() cleanup

While looking at some other notifier callbacks I noticed this code could use a simple cleanup. notifier_from_errno() no longer needs the if (ret)/else conditional. That same conditional is now done in notifier_from_errno(). Signed-off-by: Prarit Bhargava <[email protected]> Cc: Paul Menage <[email protected]> Cc: Li Zefan <[email protected]> Acked-by: Pekka Enberg <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Baughn · Mar 23, 2011 · 5fda1bd · 5fda1bd
1 parent cbf978b
commit 5fda1bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
@@ -243,12 +243,7 @@ static int __meminit page_cgroup_callback(struct notifier_block *self,
 		break;
 	}
 
-	if (ret)
-		ret = notifier_from_errno(ret);
-	else
-		ret = NOTIFY_OK;
-
-	return ret;
+	return notifier_from_errno(ret);
 }
 
 #endif

diff --git a/mm/slab.c b/mm/slab.c
@@ -1390,7 +1390,7 @@ static int __meminit slab_memory_callback(struct notifier_block *self,
 		break;
 	}
 out:
-	return ret ? notifier_from_errno(ret) : NOTIFY_OK;
+	return notifier_from_errno(ret);
 }
 #endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */
-Original file line number
+Diff line change
@@ Expand Up @@
     		break;
     	}
     out:
-    	return ret ? notifier_from_errno(ret) : NOTIFY_OK;
+    	return notifier_from_errno(ret);
     }
     #endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */
@@ Expand Down @@