summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-07-03 15:07:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:59 -0700
commit17cc54b20e4a06c081dec6abc9317a69605db541 (patch)
tree79c76f73290df1722e94ca1f1f445db38e69c0d9
parent11f54d05865c009a468e9d7adaa7414749daa6ca (diff)
downloadblackbird-op-linux-17cc54b20e4a06c081dec6abc9317a69605db541.tar.gz
blackbird-op-linux-17cc54b20e4a06c081dec6abc9317a69605db541.zip
drivers/rtc/rtc-isl12022.c: use PTR_RET()
Use of PTR_RET() simplifies the code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-isl12022.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 6f2de99e2616..5dbdc4405718 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -16,6 +16,7 @@
#include <linux/rtc.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/err.h>
#define DRV_VERSION "0.1"
@@ -267,10 +268,7 @@ static int isl12022_probe(struct i2c_client *client,
isl12022->rtc = devm_rtc_device_register(&client->dev,
isl12022_driver.driver.name,
&isl12022_rtc_ops, THIS_MODULE);
- if (IS_ERR(isl12022->rtc))
- return PTR_ERR(isl12022->rtc);
-
- return 0;
+ return PTR_RET(isl12022->rtc);
}
static const struct i2c_device_id isl12022_id[] = {
OpenPOWER on IntegriCloud