rtc: s5m: driver improvements
v5 cover rtc: s5m: driver improvements
From: Bartosz Golaszewski <[email protected]>
This is a set of improvements for the rtc-s5m driver. The first patch is new in v4: I noticed the I2C regmap is not selected by this driver's Kconfig. Two subsequent patches were already submitted separately.
v1 -> v2:
- remove the remove() callback
v2 -> v3:
- fix an error pointed out by the build robot
v3 -> v4:
- add patch 1/3: ("rtc: s5m: select REGMAP_I2C")
- fix issues raised by the kernel bot
v4 -> v5:
- change the order of the patches to keep them bisectable
Bartosz Golaszewski (3):
rtc: s5m: select REGMAP_I2C
rtc: s5m: use devm_i2c_new_dummy_device()
rtc: s5m: check the return value of s5m8767_rtc_init_reg()
drivers/rtc/Kconfig | 1 + drivers/rtc/rtc-s5m.c | 33 +++++++++------------------------ 2 files changed, 10 insertions(+), 24 deletions(-)
Signature · 1 line
2.29.1
PATCH v5 1/3 rtc: s5m: select REGMAP_I2C
From: Bartosz Golaszewski <[email protected]>
The rtc-s5m uses the I2C regmap but doesn't select it in Kconfig so depending on the configuration the build may fail. Fix it.
--- drivers/rtc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/Kconfig +1 -0
@@ -692,6 +692,7 @@ config RTC_DRV_S5M tristate "Samsung S2M/S5M series" depends on MFD_SEC_CORE || COMPILE_TEST select REGMAP_IRQ + select REGMAP_I2C help If you say yes here you will get support for the RTC of Samsung S2MPS14 and S5M PMIC series.
Signature · 1 line
2.29.1
PATCH v5 2/3 rtc: s5m: use devm_i2c_new_dummy_device()
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Use the managed variant of i2c_new_dummy_device() to shrink code and remove the goto label. We can drop the remove callback now too.
--- drivers/rtc/rtc-s5m.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-)
drivers/rtc/rtc-s5m.c +7 -24
@@ -760,7 +760,8 @@ static int s5m_rtc_probe(struct platform_device *pdev)return -ENODEV ; } - info->i2c =i2c_new_dummy_device (s5m87xx->i2c->adapter,RTC_I2C_ADDR ); + info->i2c =devm_i2c_new_dummy_device (&pdev->dev, s5m87xx->i2c->adapter, +RTC_I2C_ADDR );if (IS_ERR (info->i2c)) {dev_err (&pdev->dev,"Failed to allocate I2C for RTC\n" );return PTR_ERR (info->i2c);
@@ -771,7 +772,7 @@ static int s5m_rtc_probe(struct platform_device *pdev) ret =PTR_ERR (info->regmap);dev_err (&pdev->dev,"Failed to allocate RTC register map: %d\n" , ret); - goto err; +return ret; } info->dev = &pdev->dev;
@@ -781,10 +782,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)if (s5m87xx->irq_data) { info->irq =regmap_irq_get_virq (s5m87xx->irq_data, alarm_irq);if (info->irq <=0 ) { - ret = -EINVAL ;dev_err (&pdev->dev,"Failed to get virtual IRQ %d\n" , alarm_irq); - goto err; +return -EINVAL ; } }
@@ -797,10 +797,8 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->rtc_dev =devm_rtc_device_register (&pdev->dev,"s5m-rtc" , &s5m_rtc_ops,THIS_MODULE ); -if (IS_ERR (info->rtc_dev)) { - ret =PTR_ERR (info->rtc_dev); - goto err; - } +if (IS_ERR (info->rtc_dev)) +return PTR_ERR (info->rtc_dev);if (!info->irq) {dev_info (&pdev->dev,"Alarm IRQ not available\n" );
@@ -813,23 +811,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (&pdev->dev,"Failed to request alarm IRQ: %d: %d\n" , info->irq, ret); - goto err; +return ret; } -return 0 ; - -err: -i2c_unregister_device (info->i2c); - -return ret; -} - -static int s5m_rtc_remove (struct platform_device *pdev) -{ -struct s5m_rtc_info *info =platform_get_drvdata (pdev); - -i2c_unregister_device (info->i2c); -return 0 ; }
@@ -874,7 +858,6 @@ static struct platform_driver s5m_rtc_driver = { .pm = &s5m_rtc_pm_ops, }, .probe = s5m_rtc_probe, - .remove = s5m_rtc_remove, .id_table = s5m_rtc_id, };
Signature · 1 line
2.29.1
PATCH v5 3/3 rtc: s5m: check the return value of s5m8767_rtc_init_reg()
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
This function can fail if regmap operations fail so check its return value in probe().
--- drivers/rtc/rtc-s5m.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/rtc/rtc-s5m.c +2 -0
@@ -791,6 +791,8 @@ static int s5m_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, info); ret =s5m8767_rtc_init_reg (info); +if (ret) +return ret;device_init_wakeup (&pdev->dev,1 );
Signature · 1 line
2.29.1
Re: [PATCH v5 3/3] rtc: s5m: check the return value of s5m8767_rtc_init_reg()
Quoted 9 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
This function can fail if regmap operations fail so check its return value in
probe().Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/rtc/rtc-s5m.c | 2 ++ 1 file changed, 2 insertions(+)
Best regards,
Krzysztof
Quoted 8 lines · Bartosz Golaszewski
This is a set of improvements for the rtc-s5m driver. The first patch is new in v4: I noticed the I2C regmap is not selected by this driver's
Kconfig. Two subsequent patches were already submitted separately.v1 -> v2:
- remove theremove()callback[...]
Applied, thanks!
[1/3] rtc: s5m: select REGMAP_I2C
commit: 1f0cbda3b452b520c5f3794f8f0e410e8bc7386a
[2/3] rtc: s5m: use devm_i2c_new_dummy_device()
commit: 7db7ad0817fe7d3c6fcbd9402deb7509b2851f06
[3/3] rtc: s5m: check the return value of s5m8767_rtc_init_reg()
commit: 3be95d277484117f248b2f7e8cb8d14cb38dbb04Best regards,
Signature · 1 line
Alexandre Belloni <[email protected]>