diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-05-27 22:28:31 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-06-18 01:23:23 +0200 |
commit | 42588958147c7cc5a68726f14579011ad96663bb (patch) | |
tree | ee67e2dfa93650c6f16ba83145d056f45767d8b3 /drivers/nvdimm/bus.c | |
parent | libnvdimm, btt: update the usage section in Documentation (diff) | |
download | linux-42588958147c7cc5a68726f14579011ad96663bb.tar.xz linux-42588958147c7cc5a68726f14579011ad96663bb.zip |
libnvdimm: IS_ERR() usage cleanup
Prompted by commit 287980e49ffc "remove lots of IS_ERR_VALUE abuses", I
ran make coccicheck against drivers/nvdimm/ and found that:
if (IS_ERR(x))
return PTR_ERR(x);
return 0;
...can be replaced with PTR_ERR_OR_ZERO().
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/bus.c')
-rw-r--r-- | drivers/nvdimm/bus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index f085f8bceae8..e4882e63bece 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -395,12 +395,10 @@ int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus) dev = device_create(nd_class, &nvdimm_bus->dev, devt, nvdimm_bus, "ndctl%d", nvdimm_bus->id); - if (IS_ERR(dev)) { + if (IS_ERR(dev)) dev_dbg(&nvdimm_bus->dev, "failed to register ndctl%d: %ld\n", nvdimm_bus->id, PTR_ERR(dev)); - return PTR_ERR(dev); - } - return 0; + return PTR_ERR_OR_ZERO(dev); } void nvdimm_bus_destroy_ndctl(struct nvdimm_bus *nvdimm_bus) |