Patchwork Fix build for S3C_RTC.

login
register
mail settings
Submitter Jiri Pinkava
Date March 28, 2011, 1:31 a.m.
Message ID <1301275884-29193-1-git-send-email-jiri.pinkava@vscht.cz>
Download mbox | patch
Permalink /patch/88528/
State New
Headers show

Comments

Jiri Pinkava - March 28, 2011, 1:31 a.m.
Fix build RTC for s3c. Resolve bug introduced by commit
80d4bb515b78f38738f3378fd1be6039063ab040. Function s3c_rtc_setpie
has been removed but not all it's usages.

Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
---
 drivers/rtc/rtc-s3c.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Wan ZongShun - March 31, 2011, 1:54 p.m.
2011/3/28 Jiri Pinkava <jiri.pinkava@vscht.cz>:
> Fix build RTC for s3c. Resolve bug introduced by commit
> 80d4bb515b78f38738f3378fd1be6039063ab040. Function s3c_rtc_setpie
> has been removed but not all it's usages.
>
> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
> ---
>  drivers/rtc/rtc-s3c.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> index 7149649..b3466c4 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -336,7 +336,6 @@ static void s3c_rtc_release(struct device *dev)
>
>        /* do not clear AIE here, it may be needed for wake */
>
> -       s3c_rtc_setpie(dev, 0);
>        free_irq(s3c_rtc_alarmno, rtc_dev);
>        free_irq(s3c_rtc_tickno, rtc_dev);
>  }
> @@ -408,7 +407,6 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
>        platform_set_drvdata(dev, NULL);
>        rtc_device_unregister(rtc);
>
> -       s3c_rtc_setpie(&dev->dev, 0);
>        s3c_rtc_setaie(&dev->dev, 0);
>
>        clk_disable(rtc_clk);

Good patch.

Hi Andrew, Please help to merge it into your tree.
Acked-by: Wan ZongShun <mcuos.com@gmail.com>

> --
> 1.7.1
>
> --
> You received this message because you are subscribed to "rtc-linux".
> Membership options at http://groups.google.com/group/rtc-linux .
> Please read http://groups.google.com/group/rtc-linux/web/checklist
> before submitting a driver.

Patch

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 7149649..b3466c4 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -336,7 +336,6 @@  static void s3c_rtc_release(struct device *dev)
 
 	/* do not clear AIE here, it may be needed for wake */
 
-	s3c_rtc_setpie(dev, 0);
 	free_irq(s3c_rtc_alarmno, rtc_dev);
 	free_irq(s3c_rtc_tickno, rtc_dev);
 }
@@ -408,7 +407,6 @@  static int __devexit s3c_rtc_remove(struct platform_device *dev)
 	platform_set_drvdata(dev, NULL);
 	rtc_device_unregister(rtc);
 
-	s3c_rtc_setpie(&dev->dev, 0);
 	s3c_rtc_setaie(&dev->dev, 0);
 
 	clk_disable(rtc_clk);