aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-07-15 06:13:32 -0400
committerRusty Russell <rusty@rustcorp.com.au>2013-07-16 02:36:00 -0400
commitdac30a9843f8a6007e9d25cad2b5735679041397 (patch)
tree402bfeed65b13cc1bead421b58a442ae82fa0924 /drivers/rtc
parent6b4f2b56a48c8ea9775bd2b29681725d4474367a (diff)
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>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-da9052.c2
-rw-r--r--drivers/rtc/rtc-isl12022.c2
-rw-r--r--drivers/rtc/rtc-m48t35.c2
-rw-r--r--drivers/rtc/rtc-pcf8563.c2
-rw-r--r--drivers/rtc/rtc-pcf8583.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 9c8c19441cc6..4385ca4503da 100644
--- 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)
250 250
251 rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, 251 rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
252 &da9052_rtc_ops, THIS_MODULE); 252 &da9052_rtc_ops, THIS_MODULE);
253 return PTR_RET(rtc->rtc); 253 return PTR_ERR_OR_ZERO(rtc->rtc);
254} 254}
255 255
256static struct platform_driver da9052_rtc_driver = { 256static struct platform_driver da9052_rtc_driver = {
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 5dbdc4405718..03b891129428 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -268,7 +268,7 @@ static int isl12022_probe(struct i2c_client *client,
268 isl12022->rtc = devm_rtc_device_register(&client->dev, 268 isl12022->rtc = devm_rtc_device_register(&client->dev,
269 isl12022_driver.driver.name, 269 isl12022_driver.driver.name,
270 &isl12022_rtc_ops, THIS_MODULE); 270 &isl12022_rtc_ops, THIS_MODULE);
271 return PTR_RET(isl12022->rtc); 271 return PTR_ERR_OR_ZERO(isl12022->rtc);
272} 272}
273 273
274static const struct i2c_device_id isl12022_id[] = { 274static const struct i2c_device_id isl12022_id[] = {
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 23c3779a5f2b..411adb3f86a1 100644
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -175,7 +175,7 @@ static int m48t35_probe(struct platform_device *pdev)
175 175
176 priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35", 176 priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35",
177 &m48t35_ops, THIS_MODULE); 177 &m48t35_ops, THIS_MODULE);
178 return PTR_RET(priv->rtc); 178 return PTR_ERR_OR_ZERO(priv->rtc);
179} 179}
180 180
181static struct platform_driver m48t35_platform_driver = { 181static struct platform_driver m48t35_platform_driver = {
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 710c3a5aa6ff..63b558c48196 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -264,7 +264,7 @@ static int pcf8563_probe(struct i2c_client *client,
264 pcf8563_driver.driver.name, 264 pcf8563_driver.driver.name,
265 &pcf8563_rtc_ops, THIS_MODULE); 265 &pcf8563_rtc_ops, THIS_MODULE);
266 266
267 return PTR_RET(pcf8563->rtc); 267 return PTR_ERR_OR_ZERO(pcf8563->rtc);
268} 268}
269 269
270static const struct i2c_device_id pcf8563_id[] = { 270static const struct i2c_device_id pcf8563_id[] = {
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 843a745c42f3..c2639845186b 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -285,7 +285,7 @@ static int pcf8583_probe(struct i2c_client *client,
285 pcf8583_driver.driver.name, 285 pcf8583_driver.driver.name,
286 &pcf8583_rtc_ops, THIS_MODULE); 286 &pcf8583_rtc_ops, THIS_MODULE);
287 287
288 return PTR_RET(pcf8583->rtc); 288 return PTR_ERR_OR_ZERO(pcf8583->rtc);
289} 289}
290 290
291static const struct i2c_device_id pcf8583_id[] = { 291static const struct i2c_device_id pcf8583_id[] = {