diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-12 15:59:44 +0530 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-29 15:13:58 +0200 |
| commit | a1c83681d52704c766d576bea2d7f2f99e8dde23 (patch) | |
| tree | 7439a3502559d447c21d5aabfbd483f456d0ec66 /fs/proc | |
| parent | bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f (diff) | |
| download | op-kernel-dev-a1c83681d52704c766d576bea2d7f2f99e8dde23.zip op-kernel-dev-a1c83681d52704c766d576bea2d7f2f99e8dde23.tar.gz | |
fs: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Jeff Layton <jlayton@poochiereds.net>
Reviewed-by: David Howells <dhowells@redhat.com>
Reviewed-by: Steve French <smfrench@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/proc_sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index fdda62e..fe5b6e6 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -948,7 +948,7 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir, found: subdir->header.nreg++; failed: - if (unlikely(IS_ERR(subdir))) { + if (IS_ERR(subdir)) { pr_err("sysctl could not get directory: "); sysctl_print_dir(dir); pr_cont("/%*.*s %ld\n", |
