openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: snvs: Use devm_add_action_or_reset() for calls to clk_disable_unprepare() 

Use devm_add_action_or_reset() for calls to clk_disable_unprepare(),
which can simplify the error handling.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Link: https://lore.kernel.org/r/1584109849-21402-1-git-send-email-Anson.Huang@nxp.com
Link: https://lore.kernel.org/r/1584233264-26025-1-git-send-email-Anson.Huang@nxp.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Anson Huang 2020-03-13 22:30:49 +08:00 committed by Alexandre Belloni
parent 21cbe81094
commit 7863bd076b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/rtc/rtc-snvs.c
View File

@ -263,6 +263,12 @@ static const struct regmap_config snvs_rtc_config = {
.reg_stride = 4, .reg_stride = 4,
}; };
static void snvs_rtc_action(void *data)
{
if (data)
clk_disable_unprepare(data);
}
static int snvs_rtc_probe(struct platform_device *pdev) static int snvs_rtc_probe(struct platform_device *pdev)
{ {
struct snvs_rtc_data *data; struct snvs_rtc_data *data;
@ -313,6 +319,10 @@ static int snvs_rtc_probe(struct platform_device *pdev)
} }
} }
ret = devm_add_action_or_reset(&pdev->dev, snvs_rtc_action, data->clk);
if (ret)
return ret;
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
/* Initialize glitch detect */ /* Initialize glitch detect */
@ -325,7 +335,7 @@ static int snvs_rtc_probe(struct platform_device *pdev)
ret = snvs_rtc_enable(data, true); ret = snvs_rtc_enable(data, true);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to enable rtc %d\n", ret); dev_err(&pdev->dev, "failed to enable rtc %d\n", ret);
goto error_rtc_device_register; return ret;
} }
device_init_wakeup(&pdev->dev, true); device_init_wakeup(&pdev->dev, true);
@ -338,24 +348,13 @@ static int snvs_rtc_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request irq %d: %d\n", dev_err(&pdev->dev, "failed to request irq %d: %d\n",
data->irq, ret); data->irq, ret);
goto error_rtc_device_register; return ret;
} }
data->rtc->ops = &snvs_rtc_ops; data->rtc->ops = &snvs_rtc_ops;
data->rtc->range_max = U32_MAX; data->rtc->range_max = U32_MAX;
ret = rtc_register_device(data->rtc);
if (ret) {
dev_err(&pdev->dev, "failed to register rtc: %d\n", ret);
goto error_rtc_device_register;
}
return 0; return rtc_register_device(data->rtc);
error_rtc_device_register:
if (data->clk)
clk_disable_unprepare(data->clk);
return ret;
} }
static int __maybe_unused snvs_rtc_suspend_noirq(struct device *dev) static int __maybe_unused snvs_rtc_suspend_noirq(struct device *dev)