rtc: remove superfluous error message

The RTC core now has error messages in case of registration failure, there
is no need to have other messages in the drivers.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20190818220041.17833-2-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c
index 9aa4a59dbf47fa5be38844dfc339b5ba872b304d..75779e8501a30a21ca481fd51d53f2f38abaef20 100644 (file)
--- a/drivers/rtc/rtc-88pm80x.c
+++ b/drivers/rtc/rtc-88pm80x.c
@@ -295,10 +295,9 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
        info->rtc_dev->range_max = U32_MAX;
 
        ret = rtc_register_device(info->rtc_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
+       if (ret)
                goto out_rtc;
-       }
+
        /*
         * enable internal XO instead of internal 3.25MHz clock since it can
         * free running in PMIC power-down state.

diff --git a/drivers/rtc/rtc-ab-eoz9.c b/drivers/rtc/rtc-ab-eoz9.c
index e4f6e0061ccfffc66463c4fe68eb170fc7c9812f..d690985caa4cfea22c2d1b7796219e7f66e98cf0 100644 (file)
--- a/drivers/rtc/rtc-ab-eoz9.c
+++ b/drivers/rtc/rtc-ab-eoz9.c
@@ -390,35 +390,31 @@ static int abeoz9_probe(struct i2c_client *client,
 
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C |
                                     I2C_FUNC_SMBUS_BYTE_DATA |
-                                    I2C_FUNC_SMBUS_I2C_BLOCK)) {
-               ret = -ENODEV;
-               goto err;
-       }
+                                    I2C_FUNC_SMBUS_I2C_BLOCK))
+               return -ENODEV;
 
        regmap = devm_regmap_init_i2c(client, &abeoz9_rtc_regmap_config);
        if (IS_ERR(regmap)) {
                ret = PTR_ERR(regmap);
                dev_err(dev, "regmap allocation failed: %d\n", ret);
-               goto err;
+               return ret;
        }
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-       if (!data) {
-               ret = -ENOMEM;
-               goto err;
-       }
+       if (!data)
+               return -ENOMEM;
 
        data->regmap = regmap;
        dev_set_drvdata(dev, data);
 
        ret = abeoz9_rtc_setup(dev, client->dev.of_node);
        if (ret)
-               goto err;
+               return ret;
 
        data->rtc = devm_rtc_allocate_device(dev);
        ret = PTR_ERR_OR_ZERO(data->rtc);
        if (ret)
-               goto err;
+               return ret;
 
        data->rtc->ops = &rtc_ops;
        data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
@@ -426,14 +422,10 @@ static int abeoz9_probe(struct i2c_client *client,
 
        ret = rtc_register_device(data->rtc);
        if (ret)
-               goto err;
+               return ret;
 
        abeoz9_hwmon_register(dev, data);
        return 0;
-
-err:
-       dev_err(dev, "unable to register RTC device (%d)\n", ret);
-       return ret;
 }
 
 #ifdef CONFIG_OF

diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c
index a4dcf29503965db6a7415da3529c0c3a1c63bd24..29223931aba7216cfdf7df61592fbfea92224ccc 100644 (file)
--- a/drivers/rtc/rtc-ac100.c
+++ b/drivers/rtc/rtc-ac100.c
@@ -610,15 +610,7 @@ static int ac100_rtc_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = rtc_register_device(chip->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to register device\n");
-               return ret;
-       }
-
-       dev_info(&pdev->dev, "RTC enabled\n");
-
-       return 0;
+       return rtc_register_device(chip->rtc);
 }
 
 static int ac100_rtc_remove(struct platform_device *pdev)

diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 8e8b8079b60a7fd14b221f62b6360774930d0ab7..9351bd52477e93c96a279012d575050ea87907f6 100644 (file)
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -502,7 +502,6 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
        struct resource *res;
        struct armada38x_rtc *rtc;
        const struct of_device_id *match;
-       int ret;
 
        match = of_match_device(armada38x_rtc_of_match_table, &pdev->dev);
        if (!match)
@@ -561,11 +560,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc_dev->range_max = U32_MAX;
 
-       ret = rtc_register_device(rtc->rtc_dev);
-       if (ret)
-               dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-
-       return ret;
+       return rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP

diff --git a/drivers/rtc/rtc-aspeed.c b/drivers/rtc/rtc-aspeed.c
index af3eb676d7c32d122ce4400bb64db82986d3b446..e351d35b29a3ada596071ab0bfd04c38752aec77 100644 (file)
--- a/drivers/rtc/rtc-aspeed.c
+++ b/drivers/rtc/rtc-aspeed.c
@@ -86,7 +86,6 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
 {
        struct aspeed_rtc *rtc;
        struct resource *res;
-       int ret;
 
        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
@@ -107,11 +106,7 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
        rtc->rtc_dev->range_min = RTC_TIMESTAMP_BEGIN_1900;
        rtc->rtc_dev->range_max = 38814989399LL; /* 3199-12-31 23:59:59 */
 
-       ret = rtc_register_device(rtc->rtc_dev);
-       if (ret)
-               return ret;
-
-       return 0;
+       return rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id aspeed_rtc_match[] = {

diff --git a/drivers/rtc/rtc-bd70528.c b/drivers/rtc/rtc-bd70528.c
index 3e745c05bc22a23553f6bcb9ca93483f5008dc1e..7744333b0f4019a98413f4d1f09aa165c4f4b51a 100644 (file)
--- a/drivers/rtc/rtc-bd70528.c
+++ b/drivers/rtc/rtc-bd70528.c
@@ -476,11 +476,7 @@ static int bd70528_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = rtc_register_device(rtc);
-       if (ret)
-               dev_err(&pdev->dev, "Registering RTC failed\n");
-
-       return ret;
+       return rtc_register_device(rtc);
 }
 
 static struct platform_driver bd70528_rtc = {

diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
index 2f65943867f517a9d1cebc2ed349d022fb23da34..3e9800f9878af91884a8934c6fa4ddf39b49a389 100644 (file)
--- a/drivers/rtc/rtc-brcmstb-waketimer.c
+++ b/drivers/rtc/rtc-brcmstb-waketimer.c
@@ -255,10 +255,8 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
        timer->rtc->range_max = U32_MAX;
 
        ret = rtc_register_device(timer->rtc);
-       if (ret) {
-               dev_err(dev, "unable to register device\n");
+       if (ret)
                goto err_notifier;
-       }
 
        dev_info(dev, "registered, with irq %d\n", timer->irq);
 

diff --git a/drivers/rtc/rtc-cadence.c b/drivers/rtc/rtc-cadence.c
index 3b7d643c8a63b45f43d881b1e940fcc135f26851..592aae23cbaf4eaf3f16661a27e1ac211122cbbe 100644 (file)
--- a/drivers/rtc/rtc-cadence.c
+++ b/drivers/rtc/rtc-cadence.c
@@ -289,12 +289,8 @@ static int cdns_rtc_probe(struct platform_device *pdev)
        }
 
        crtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
-       if (IS_ERR(crtc->rtc_dev)) {
-               ret = PTR_ERR(crtc->rtc_dev);
-               dev_err(&pdev->dev,
-                       "Failed to allocate the RTC device, %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(crtc->rtc_dev))
+               return PTR_ERR(crtc->rtc_dev);
 
        platform_set_drvdata(pdev, crtc);
 
@@ -343,11 +339,8 @@ static int cdns_rtc_probe(struct platform_device *pdev)
        writel(CDNS_RTC_KRTCR_KRTC, crtc->regs + CDNS_RTC_KRTCR);
 
        ret = rtc_register_device(crtc->rtc_dev);
-       if (ret) {
-               dev_err(&pdev->dev,
-                       "Failed to register the RTC device, %d\n", ret);
+       if (ret)
                goto err_disable_wakeup;
-       }
 
        return 0;
 

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index e04d6e862c4281496977ee6aee5f2f6089b7ba7d..4420fbf2f8fee5553f7030801d50dca029e5486a 100644 (file)
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -690,19 +690,16 @@ static int ds1305_probe(struct spi_device *spi)
 
        /* register RTC ... from here on, ds1305->ctrl needs locking */
        ds1305->rtc = devm_rtc_allocate_device(&spi->dev);
-       if (IS_ERR(ds1305->rtc)) {
+       if (IS_ERR(ds1305->rtc))
                return PTR_ERR(ds1305->rtc);
-       }
 
        ds1305->rtc->ops = &ds1305_ops;
 
        ds1305_nvmem_cfg.priv = ds1305;
        ds1305->rtc->nvram_old_abi = true;
        status = rtc_register_device(ds1305->rtc);
-       if (status) {
-               dev_dbg(&spi->dev, "register rtc --> %d\n", status);
+       if (status)
                return status;
-       }
 
        rtc_nvmem_register(ds1305->rtc, &ds1305_nvmem_cfg);
 

diff --git a/drivers/rtc/rtc-imx-sc.c b/drivers/rtc/rtc-imx-sc.c
index c933045fe04b73e77a1a263f56b7d4ccfbfda33a..cf2c12107f2b8266afdf08c207691cb1f989ee9a 100644 (file)
--- a/drivers/rtc/rtc-imx-sc.c
+++ b/drivers/rtc/rtc-imx-sc.c
@@ -167,10 +167,8 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
        imx_sc_rtc->range_max = U32_MAX;
 
        ret = rtc_register_device(imx_sc_rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register rtc: %d\n", ret);
+       if (ret)
                return ret;
-       }
 
        imx_scu_irq_register_notifier(&imx_sc_rtc_alarm_sc_notifier);
 

diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 3ec6bb230cd5f811e7ddec50c9740a25f1ab4475..3089645e0ce87fa6ef1461d4fc04484836023ccf 100644 (file)
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -360,10 +360,8 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
        rtc->rtc->range_max = U32_MAX;
 
        ret = rtc_register_device(rtc->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register rtc device: %d\n", ret);
+       if (ret)
                return ret;
-       }
 
        ret = devm_request_irq(&pdev->dev, rtc->irq, jz4740_rtc_irq, 0,
                                pdev->name, rtc);

diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
index b46ed4dc701592fc09476f0f37e65b7021e86099..704229eb0cacb9f101fa60f5c58a749d98a6a258 100644 (file)
--- a/drivers/rtc/rtc-mt6397.c
+++ b/drivers/rtc/rtc-mt6397.c
@@ -343,10 +343,8 @@ static int mtk_rtc_probe(struct platform_device *pdev)
        rtc->rtc_dev->ops = &mtk_rtc_ops;
 
        ret = rtc_register_device(rtc->rtc_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "register rtc device failed\n");
+       if (ret)
                goto out_free_irq;
-       }
 
        return 0;
 

diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 56a7cf1547a72f4a2f582cc0585dead3c36ab533..89ff713163dd57711d518e49958a014f63b95e1b 100644 (file)
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -235,10 +235,8 @@ static int puv3_rtc_probe(struct platform_device *pdev)
        /* register RTC and exit */
        rtc->ops = &puv3_rtcops;
        ret = rtc_register_device(rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "cannot attach rtc\n");
+       if (ret)
                goto err_nortc;
-       }
 
        /* platform setup code should have handled this; sigh */
        if (!device_can_wakeup(&pdev->dev))

diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c
index 06884ebb7a61512f0e5a4bab5fa944647b45441f..2b316661a5782f289f37c00ab107aed0c7ab1ba2 100644 (file)
--- a/drivers/rtc/rtc-rv3028.c
+++ b/drivers/rtc/rtc-rv3028.c
@@ -639,9 +639,8 @@ static int rv3028_probe(struct i2c_client *client)
                dev_warn(&client->dev, "An alarm may have been missed.\n");
 
        rv3028->rtc = devm_rtc_allocate_device(&client->dev);
-       if (IS_ERR(rv3028->rtc)) {
+       if (IS_ERR(rv3028->rtc))
                return PTR_ERR(rv3028->rtc);
-       }
 
        if (client->irq > 0) {
                ret = devm_request_threaded_irq(&client->dev, client->irq,

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index fc52434001082a54fe767c0cd1d7a830bdc5a21c..4960f0a2b249a25e04d3eb69289f96b10b22e154 100644 (file)
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -564,9 +564,8 @@ static int rv8803_probe(struct i2c_client *client,
                dev_warn(&client->dev, "An alarm maybe have been missed.\n");
 
        rv8803->rtc = devm_rtc_allocate_device(&client->dev);
-       if (IS_ERR(rv8803->rtc)) {
+       if (IS_ERR(rv8803->rtc))
                return PTR_ERR(rv8803->rtc);
-       }
 
        if (client->irq > 0) {
                err = devm_request_threaded_irq(&client->dev, client->irq,

diff --git a/drivers/rtc/rtc-sc27xx.c b/drivers/rtc/rtc-sc27xx.c
index 698e1e51efca97ef4e3a35b21cffdfe5b0242f53..3474f7a204933717d5e295a82babbab2e5b9059b 100644 (file)
--- a/drivers/rtc/rtc-sc27xx.c
+++ b/drivers/rtc/rtc-sc27xx.c
@@ -654,7 +654,6 @@ static int sprd_rtc_probe(struct platform_device *pdev)
        rtc->rtc->range_max = 5662310399LL;
        ret = rtc_register_device(rtc->rtc);
        if (ret) {
-               dev_err(&pdev->dev, "failed to register rtc device\n");
                device_init_wakeup(&pdev->dev, 0);
                return ret;
        }

diff --git a/drivers/rtc/rtc-sd3078.c b/drivers/rtc/rtc-sd3078.c
index 42cb90db7f94eff831505df9e06299679bbe8a96..a7aa943c11837a9b4188db80ca5c19bf9c0abcd6 100644 (file)
--- a/drivers/rtc/rtc-sd3078.c
+++ b/drivers/rtc/rtc-sd3078.c
@@ -193,10 +193,8 @@ static int sd3078_probe(struct i2c_client *client,
        sd3078->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
        ret = rtc_register_device(sd3078->rtc);
-       if (ret) {
-               dev_err(&client->dev, "failed to register rtc device\n");
+       if (ret)
                return ret;
-       }
 
        sd3078_enable_reg_write(sd3078);
 

diff --git a/drivers/rtc/rtc-sunxi.c b/drivers/rtc/rtc-sunxi.c
index 0bb69a7f9e462c2d32fb7425a34a7ff1c79ec4ef..9b6f2483c1c6ac9d40f082ea1e850592f2fb2344 100644 (file)
--- a/drivers/rtc/rtc-sunxi.c
+++ b/drivers/rtc/rtc-sunxi.c
@@ -472,15 +472,7 @@ static int sunxi_rtc_probe(struct platform_device *pdev)
 
        chip->rtc->ops = &sunxi_rtc_ops;
 
-       ret = rtc_register_device(chip->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to register device\n");
-               return ret;
-       }
-
-       dev_info(&pdev->dev, "RTC enabled\n");
-
-       return 0;
+       return rtc_register_device(chip->rtc);
 }
 
 static struct platform_driver sunxi_rtc_driver = {

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index 14bf835229e68f9f6c935a9bb6de2d8613a19dec..69d695bf9500d2b5a21e1e4fffdd5074302738d8 100644 (file)
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -332,10 +332,8 @@ static int tegra_rtc_probe(struct platform_device *pdev)
        }
 
        ret = rtc_register_device(info->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register device: %d\n", ret);
+       if (ret)
                goto disable_clk;
-       }
 
        dev_notice(&pdev->dev, "Tegra internal Real Time Clock\n");
 

diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c
index d6434e514a526dc73a681d09e097a941e6f79931..859d901fa6cbb3802683078c1899f256dd99db22 100644 (file)
--- a/drivers/rtc/rtc-tps6586x.c
+++ b/drivers/rtc/rtc-tps6586x.c
@@ -259,7 +259,6 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
        rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
        if (IS_ERR(rtc->rtc)) {
                ret = PTR_ERR(rtc->rtc);
-               dev_err(&pdev->dev, "RTC allocate device: ret %d\n", ret);
                goto fail_rtc_register;
        }
 
@@ -280,10 +279,8 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
        disable_irq(rtc->irq);
 
        ret = rtc_register_device(rtc->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "RTC device register: ret %d\n", ret);
+       if (ret)
                goto fail_rtc_register;
-       }
 
        return 0;
 

diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
index 7078f6da1cbcf507532835bd1f5f04dad7948ebd..2c0467a9e71798a201291bd9097f1da80da894ea 100644 (file)
--- a/drivers/rtc/rtc-tps65910.c
+++ b/drivers/rtc/rtc-tps65910.c
@@ -425,13 +425,7 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
        tps_rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
        tps_rtc->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-       ret = rtc_register_device(tps_rtc->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "RTC device register: err %d\n", ret);
-               return ret;
-       }
-
-       return 0;
+       return rtc_register_device(tps_rtc->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP