summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-07-03 15:07:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:59 -0700
commit11f54d05865c009a468e9d7adaa7414749daa6ca (patch)
tree0baf286b650d01aa09f6c53df02cde36a0846e6e
parentad87a766479d027f5966c781605bc9f7bf8bab67 (diff)
downloadblackbird-op-linux-11f54d05865c009a468e9d7adaa7414749daa6ca.tar.gz
blackbird-op-linux-11f54d05865c009a468e9d7adaa7414749daa6ca.zip
drivers/rtc/rtc-da9052.c: use PTR_RET()
Use of PTR_RET() simplifies the code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: David Dajun Chen <dchen@diasemi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-da9052.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 2f7fdd77a6f0..9c8c19441cc6 100644
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -15,6 +15,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/rtc.h>
+#include <linux/err.h>
#include <linux/mfd/da9052/da9052.h>
#include <linux/mfd/da9052/reg.h>
@@ -249,10 +250,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&da9052_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc->rtc))
- return PTR_ERR(rtc->rtc);
-
- return 0;
+ return PTR_RET(rtc->rtc);
}
static struct platform_driver da9052_rtc_driver = {
OpenPOWER on IntegriCloud