rtc: cros-ec: remove superfluous error message
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/2 rtc: cros-ec: 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 <[email protected]>
--- drivers/rtc/rtc-cros-ec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/rtc/rtc-cros-ec.c +2 -5
@@ -351,11 +351,8 @@ static int cros_ec_rtc_probe(struct platform_device *pdev) cros_ec_rtc->rtc =devm_rtc_device_register (&pdev->dev,DRV_NAME , &cros_ec_rtc_ops,THIS_MODULE ); -if (IS_ERR (cros_ec_rtc->rtc)) { - ret =PTR_ERR (cros_ec_rtc->rtc); -dev_err (&pdev->dev,"failed to register rtc device\n" ); -return ret; - } +if (IS_ERR (cros_ec_rtc->rtc)) +return PTR_ERR (cros_ec_rtc->rtc);/* Get RTC events from the EC. */ cros_ec_rtc->notifier.notifier_call = cros_ec_rtc_event;
Signature · 1 line
2.21.0
Alexandre Belloni
maintainerPATCH 2/2 rtc: cros-ec: let the core handle rtc range
Let the rtc core check the date/time against the RTC range.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-cros-ec.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/rtc/rtc-cros-ec.c +9 -8
@@ -107,11 +107,7 @@ static int cros_ec_rtc_set_time(struct device *dev, struct rtc_time *tm)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (dev);struct cros_ec_device *cros_ec = cros_ec_rtc->cros_ec;int ret; -time64_t time; - - time =rtc_tm_to_time64 (tm); -if (time <0 || time >U32_MAX ) -return -EINVAL ; +time64_t time =rtc_tm_to_time64 (tm); ret =cros_ec_rtc_set (cros_ec,EC_CMD_RTC_SET_VALUE , (u32 )time);if (ret <0 ) {
@@ -348,12 +344,17 @@ static int cros_ec_rtc_probe(struct platform_device *pdev)return ret; } - cros_ec_rtc->rtc =devm_rtc_device_register (&pdev->dev,DRV_NAME , - &cros_ec_rtc_ops, -THIS_MODULE ); + cros_ec_rtc->rtc =devm_rtc_allocate_device (&pdev->dev);if (IS_ERR (cros_ec_rtc->rtc))return PTR_ERR (cros_ec_rtc->rtc); + cros_ec_rtc->rtc->ops = &cros_ec_rtc_ops; + cros_ec_rtc->rtc->range_max =U32_MAX ; + + ret =rtc_register_device (cros_ec_rtc->rtc); +if (ret) +return ret; +/* Get RTC events from the EC. */ cros_ec_rtc->notifier.notifier_call = cros_ec_rtc_event; ret = blocking_notifier_chain_register(&cros_ec->event_notifier,
Signature · 1 line
2.21.0
Re: [PATCH 2/2] rtc: cros-ec: let the core handle rtc range
Hi Alexandre,
Quoted 3 lines · Alexandre Belloni
Let the rtc core check the date/time against the RTC range.
Signed-off-by Alexandre Belloni <[email protected]>
Tested on few devices just to make sure nothing is broken, the change looks good to me and works as expected.
Reviewed-by Enric Balletbo i Serra <[email protected]>
Quoted 43 lines
--- drivers/rtc/rtc-cros-ec.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)drivers/rtc/rtc-cros-ec.c +9
-8@@ -107,11 +107,7 @@ static int cros_ec_rtc_set_time(struct device *dev, struct rtc_time *tm)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (dev);struct cros_ec_device *cros_ec = cros_ec_rtc->cros_ec;int ret; -time64_t time; - - time =rtc_tm_to_time64 (tm); -if (time <0 || time >U32_MAX ) -return -EINVAL ; +time64_t time =rtc_tm_to_time64 (tm); ret =cros_ec_rtc_set (cros_ec,EC_CMD_RTC_SET_VALUE , (u32 )time);if (ret <0 ) {@@ -348,12 +344,17 @@ static int cros_ec_rtc_probe(struct platform_device *pdev)return ret; } - cros_ec_rtc->rtc =devm_rtc_device_register (&pdev->dev,DRV_NAME , - &cros_ec_rtc_ops, -THIS_MODULE ); + cros_ec_rtc->rtc =devm_rtc_allocate_device (&pdev->dev);if (IS_ERR (cros_ec_rtc->rtc))return PTR_ERR (cros_ec_rtc->rtc); + cros_ec_rtc->rtc->ops = &cros_ec_rtc_ops; + cros_ec_rtc->rtc->range_max =U32_MAX ; + + ret =rtc_register_device (cros_ec_rtc->rtc); +if (ret) +return ret; +/* Get RTC events from the EC. */ cros_ec_rtc->notifier.notifier_call = cros_ec_rtc_event; ret = blocking_notifier_chain_register(&cros_ec->event_notifier,
Hi Alexandre,
Quoted 4 lines · Alexandre Belloni
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 <[email protected]>
That makes totally sense for me.
Reviewed-by Enric Balletbo i Serra <[email protected]>
Quoted 23 lines
--- drivers/rtc/rtc-cros-ec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)drivers/rtc/rtc-cros-ec.c +2
-5@@ -351,11 +351,8 @@ static int cros_ec_rtc_probe(struct platform_device *pdev) cros_ec_rtc->rtc =devm_rtc_device_register (&pdev->dev,DRV_NAME , &cros_ec_rtc_ops,THIS_MODULE ); -if (IS_ERR (cros_ec_rtc->rtc)) { - ret =PTR_ERR (cros_ec_rtc->rtc); -dev_err (&pdev->dev,"failed to register rtc device\n" ); -return ret; - } +if (IS_ERR (cros_ec_rtc->rtc)) +return PTR_ERR (cros_ec_rtc->rtc);/* Get RTC events from the EC. */ cros_ec_rtc->notifier.notifier_call = cros_ec_rtc_event;