diff options
author | 2014-02-13 16:42:43 -0500 | |
---|---|---|
committer | 2014-02-13 16:42:45 -0500 | |
commit | 430af8ad9dad82d775d688155e1db1da385d3e7a (patch) | |
tree | 80aa4c350091f772884564fe0c009fdac3f9a534 /kernel | |
parent | sparc: fix implicit include of slab.h in leon_pci_grpci2.c (diff) | |
download | linux-430af8ad9dad82d775d688155e1db1da385d3e7a.tar.gz linux-430af8ad9dad82d775d688155e1db1da385d3e7a.tar.bz2 linux-430af8ad9dad82d775d688155e1db1da385d3e7a.zip |
cgroup: fix coccinelle warnings
kernel/cgroup.c:2256:1-3: WARNING: PTR_RET can be used
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
Generated by: coccinelle/api/ptr_ret.cocci
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 750d0e1e7e56..15dcae74b510 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2171,9 +2171,7 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cftype *cft) kn = __kernfs_create_file(cgrp->kn, cgroup_file_name(cgrp, cft, name), cgroup_file_mode(cft), 0, cft->kf_ops, cft, NULL, false, key); - if (IS_ERR(kn)) - return PTR_ERR(kn); - return 0; + return PTR_ERR_OR_ZERO(kn); } /** |