Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 13:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtc: mt6397: improvements of rtc driver

Browse Source 
- use regmap_read_poll_timeout to drop while-loop
- use devm-api to drop remove-callback

Suggested-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Josef Friedl <josef.friedl@speed.at>
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Josef Friedl 2019-09-10 09:04:42 +02:00 committed by Lee Jones
parent c512995ce9
commit 851b87148a
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/rtc/rtc-mt6397.c
View File

@ -4,16 +4,19 @@
* Author: Tianping.Fang <tianping.fang@mediatek.com> * Author: Tianping.Fang <tianping.fang@mediatek.com>
*/ */
#include <linux/delay.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/interrupt.h>
#include <linux/mfd/mt6397/core.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/mfd/mt6397/rtc.h> #include <linux/mfd/mt6397/rtc.h>
#include <linux/mod_devicetable.h>
static int mtk_rtc_write_trigger(struct mt6397_rtc *rtc) static int mtk_rtc_write_trigger(struct mt6397_rtc *rtc)
{ {
unsigned long timeout = jiffies + HZ;
int ret; int ret;
u32 data; u32 data;
@ -21,19 +24,13 @@ static int mtk_rtc_write_trigger(struct mt6397_rtc *rtc)
if (ret < 0) if (ret < 0)
return ret; return ret;
while (1) { ret = regmap_read_poll_timeout(rtc->regmap,
ret = regmap_read(rtc->regmap, rtc->addr_base + RTC_BBPU, rtc->addr_base + RTC_BBPU, data,
&data); !(data & RTC_BBPU_CBUSY),
if (ret < 0) MTK_RTC_POLL_DELAY_US,
break; MTK_RTC_POLL_TIMEOUT);
if (!(data & RTC_BBPU_CBUSY)) if (ret < 0)
break; dev_err(rtc->dev, "failed to write WRTGE: %d\n", ret);
if (time_after(jiffies, timeout)) {
ret = -ETIMEDOUT;
break;
}
cpu_relax();
}
return ret; return ret;
} }
@ -266,19 +263,19 @@ static int mtk_rtc_probe(struct platform_device *pdev)
return rtc->irq; return rtc->irq;
rtc->regmap = mt6397_chip->regmap; rtc->regmap = mt6397_chip->regmap;
rtc->dev = &pdev->dev;
mutex_init(&rtc->lock); mutex_init(&rtc->lock);
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtc_dev = devm_rtc_allocate_device(rtc->dev); rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
if (IS_ERR(rtc->rtc_dev)) if (IS_ERR(rtc->rtc_dev))
return PTR_ERR(rtc->rtc_dev); return PTR_ERR(rtc->rtc_dev);
ret = request_threaded_irq(rtc->irq, NULL, ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
mtk_rtc_irq_handler_thread, mtk_rtc_irq_handler_thread,
IRQF_ONESHOT | IRQF_TRIGGER_HIGH, IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
"mt6397-rtc", rtc); "mt6397-rtc", rtc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
rtc->irq, ret); rtc->irq, ret);
@ -300,15 +297,6 @@ out_free_irq:
return ret; return ret;
} }
static int mtk_rtc_remove(struct platform_device *pdev)
{
struct mt6397_rtc *rtc = platform_get_drvdata(pdev);
free_irq(rtc->irq, rtc);
return 0;
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int mt6397_rtc_suspend(struct device *dev) static int mt6397_rtc_suspend(struct device *dev)
{ {
@ -347,7 +335,6 @@ static struct platform_driver mtk_rtc_driver = {
.pm = &mt6397_pm_ops, .pm = &mt6397_pm_ops,
}, },
.probe = mtk_rtc_probe, .probe = mtk_rtc_probe,
.remove = mtk_rtc_remove,
}; };
module_platform_driver(mtk_rtc_driver); module_platform_driver(mtk_rtc_driver);