drivers/rtc: Replace PTR_RET with PTR_ERR_OR_ZERO

PTR_RET is now deprecated. Use PTR_ERR_OR_ZERO instead.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 9c8c19441cc65211a0c3dbd63a5147ea6e7ff8b0..4385ca4503da09b4aad0ff8d61bbb1c5c5580b19 100644 (file)
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -250,7 +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);
-       return PTR_RET(rtc->rtc);
+       return PTR_ERR_OR_ZERO(rtc->rtc);
 }
 
 static struct platform_driver da9052_rtc_driver = {

diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 5dbdc4405718f55705151b7f62ad8d76db154341..03b8911294288afb2ba29bd86811fd8723da0658 100644 (file)
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -268,7 +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);
-       return PTR_RET(isl12022->rtc);
+       return PTR_ERR_OR_ZERO(isl12022->rtc);
 }
 
 static const struct i2c_device_id isl12022_id[] = {

diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 23c3779a5f2b4b7b26bba02b222cc724fe9670c3..411adb3f86a1d89e2f9ad39683315a5b8440ce2e 100644 (file)
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -175,7 +175,7 @@ static int m48t35_probe(struct platform_device *pdev)
 
        priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35",
                                  &m48t35_ops, THIS_MODULE);
-       return PTR_RET(priv->rtc);
+       return PTR_ERR_OR_ZERO(priv->rtc);
 }
 
 static struct platform_driver m48t35_platform_driver = {

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 710c3a5aa6fff215ed960a9680d14b1ec32120a2..63b558c48196b4ab4bea5f9e3413072647e9420b 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -264,7 +264,7 @@ static int pcf8563_probe(struct i2c_client *client,
                                pcf8563_driver.driver.name,
                                &pcf8563_rtc_ops, THIS_MODULE);
 
-       return PTR_RET(pcf8563->rtc);
+       return PTR_ERR_OR_ZERO(pcf8563->rtc);
 }
 
 static const struct i2c_device_id pcf8563_id[] = {

diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 843a745c42f34adeef54b1c79ffa7146e5943f4a..c2639845186b3f8433551116074ae19197ee1866 100644 (file)
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -285,7 +285,7 @@ static int pcf8583_probe(struct i2c_client *client,
                                pcf8583_driver.driver.name,
                                &pcf8583_rtc_ops, THIS_MODULE);
 
-       return PTR_RET(pcf8583->rtc);
+       return PTR_ERR_OR_ZERO(pcf8583->rtc);
 }
 
 static const struct i2c_device_id pcf8583_id[] = {