| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 27 Aug 2009 20:36:00 +0200
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org,
Alessandro Zummo <a.zummo@...ertech.it>,
rtc-linux@...glegroups.com
Subject: Re: [PATCH] RTC: Update for final round of review comments
Hi Mark,
On Tue, Aug 25, 2009 at 11:51:08AM +0100, Mark Brown wrote:
> It looks like an early version of the WM831x RTC driver got merged into
> the mfd tree without fixes for some final review comments:
Sorry about that, fixed now...
Cheers,
Samuel.
> - Consistently get interrupts by name.
> - Implement set_mmss() rather than set_time().
> - Make the error checking a bit less excessive and noisy.
> - Clean up the private data structure.
>
> There shouldn't be any operational effect.
>
> Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> Acked-by: Alessandro Zummo <a.zummo@...ertech.it>
> Cc: rtc-linux@...glegroups.com
> ---
> drivers/rtc/rtc-wm831x.c | 29 +++++++----------------------
> 1 files changed, 7 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c
> index 99e7845..79795cd 100644
> --- a/drivers/rtc/rtc-wm831x.c
> +++ b/drivers/rtc/rtc-wm831x.c
> @@ -92,8 +92,7 @@
> struct wm831x_rtc {
> struct wm831x *wm831x;
> struct rtc_device *rtc;
> - int alarm_enabled;
> - int per_irq;
> + unsigned int alarm_enabled:1;
> };
>
> /*
> @@ -136,7 +135,7 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm)
> u32 time = (time1[0] << 16) | time1[1];
>
> rtc_time_to_tm(time, tm);
> - return 0;
> + return rtc_valid_tm(tm);
> }
>
> } while (++count < WM831X_GET_TIME_RETRIES);
> @@ -149,21 +148,15 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm)
> /*
> * Set current time and date in RTC
> */
> -static int wm831x_rtc_settime(struct device *dev, struct rtc_time *tm)
> +static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time)
> {
> struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev);
> struct wm831x *wm831x = wm831x_rtc->wm831x;
> struct rtc_time new_tm;
> - unsigned long time, new_time;
> + unsigned long new_time;
> int ret;
> int count = 0;
>
> - ret = rtc_tm_to_time(tm, &time);
> - if (ret < 0) {
> - dev_err(dev, "Failed to convert time: %d\n", ret);
> - return ret;
> - }
> -
> ret = wm831x_reg_write(wm831x, WM831X_RTC_TIME_1,
> (time >> 16) & 0xffff);
> if (ret < 0) {
> @@ -356,7 +349,7 @@ static irqreturn_t wm831x_per_irq(int irq, void *data)
>
> static const struct rtc_class_ops wm831x_rtc_ops = {
> .read_time = wm831x_rtc_readtime,
> - .set_time = wm831x_rtc_settime,
> + .set_mmss = wm831x_rtc_set_mmss,
> .read_alarm = wm831x_rtc_readalarm,
> .set_alarm = wm831x_rtc_setalarm,
> .alarm_irq_enable = wm831x_rtc_alarm_irq_enable,
> @@ -437,7 +430,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, wm831x_rtc);
> wm831x_rtc->wm831x = wm831x;
> - wm831x_rtc->per_irq = per_irq;
>
> ret = wm831x_reg_read(wm831x, WM831X_RTC_CONTROL);
> if (ret < 0) {
> @@ -453,7 +445,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
> &wm831x_rtc_ops, THIS_MODULE);
> if (IS_ERR(wm831x_rtc->rtc)) {
> ret = PTR_ERR(wm831x_rtc->rtc);
> - dev_err(&pdev->dev, "Failed to register RTC: %d\n", ret);
> goto err;
> }
>
> @@ -463,7 +454,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
> if (ret != 0) {
> dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n",
> per_irq, ret);
> - goto err_rtc;
> }
>
> ret = wm831x_request_irq(wm831x, alm_irq, wm831x_alm_irq,
> @@ -472,15 +462,10 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
> if (ret != 0) {
> dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n",
> alm_irq, ret);
> - goto err_per;
> }
>
> return 0;
>
> -err_per:
> - wm831x_free_irq(wm831x, per_irq, wm831x_rtc);
> -err_rtc:
> - rtc_device_unregister(wm831x_rtc->rtc);
> err:
> kfree(wm831x_rtc);
> return ret;
> @@ -489,8 +474,8 @@ err:
> static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
> {
> struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);
> - int per_irq = platform_get_irq(pdev, 0);
> - int alm_irq = platform_get_irq(pdev, 1);
> + int per_irq = platform_get_irq_byname(pdev, "PER");
> + int alm_irq = platform_get_irq_byname(pdev, "ALM");
>
> wm831x_free_irq(wm831x_rtc->wm831x, alm_irq, wm831x_rtc);
> wm831x_free_irq(wm831x_rtc->wm831x, per_irq, wm831x_rtc);
> --
> 1.6.3.3
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists