diff options
| author | Prarit Bhargava <[email protected]> | 2011-03-22 16:30:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-03-22 17:44:01 -0700 |
| commit | 5fda1bd5b8869574dad8e1f9f71e23bf0c186274 (patch) | |
| tree | a714e0d153622bd89cf9f775e04763ccbd6c4ca5 | |
| parent | cbf978bfb12d7deca97d7333f65eda0381a072de (diff) | |
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]>
| -rw-r--r-- | mm/page_cgroup.c | 7 | ||||
| -rw-r--r-- | mm/slab.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 5bffada7cde1..59a3cd4c799d 100644 --- 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 index a18ba57517af..568803f121a8 100644 --- 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 */ |