RTC S3C: Fix type of s3c_rtc_setaie()
Subsystems (3)
PATCH 10/10 RTC S3C: Fix type of s3c_rtc_setaie()
Change s3c_rtc_setaie() declaration in accordance with rtc_class_ops structure declaration.
--- arch/arm/mach-s3c2412/Kconfig | 7 +++++++ arch/arm/mach-s3c2412/Makefile | 3 ++- arch/arm/mach-s3c2416/Kconfig | 1 + drivers/rtc/rtc-s3c.c | 8 +++++--- 4 files changed, 15 insertions(+), 4 deletions(-)
arch/arm/mach-s3c2412/Kconfig +7 -0
@@ -28,9 +28,16 @@ config S3C2412_DMA config S3C2412_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2412 power management +config S3C2412_PM_SLEEP + bool + help + Internal config node to apply sleep for S3C2412 power management. + Can be selected by another SoCs with similar sleep procedure. + # Note, the S3C2412 IOtiming support is in plat-s3c24xx config S3C2412_CPUFREQ
arch/arm/mach-s3c2412/Makefile +2 -1
@@ -14,7 +14,8 @@ obj-$(CONFIG_CPU_S3C2412) += irq.o obj-$(CONFIG_CPU_S3C2412) += clock.o obj-$(CONFIG_CPU_S3C2412) += gpio.o obj-$(CONFIG_S3C2412_DMA) += dma.o -obj-$(CONFIG_S3C2412_PM) += pm.o sleep.o +obj-$(CONFIG_S3C2412_PM) += pm.o +obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep.o obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o # Machine support
arch/arm/mach-s3c2416/Kconfig +1 -0
@@ -27,6 +27,7 @@ config S3C2416_DMA config S3C2416_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2416 power management
drivers/rtc/rtc-s3c.c +5 -3
@@ -77,7 +77,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id) }/* Update control registers */ -static void s3c_rtc_setaie (int to) +static int s3c_rtc_setaie (struct device *dev,unsigned int to) {unsigned int tmp;
@@ -89,6 +89,8 @@ static void s3c_rtc_setaie(int to) tmp |=S3C2410_RTCALM_ALMEN ;writeb (tmp, s3c_rtc_base +S3C2410_RTCALM ); + +return 0 ; }static int s3c_rtc_setpie (struct device *dev,int enabled)
@@ -308,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)writeb (alrm_en, base +S3C2410_RTCALM ); -s3c_rtc_setaie (alrm->enabled); +s3c_rtc_setaie (dev, alrm->enabled);return 0 ; }
@@ -440,7 +442,7 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)rtc_device_unregister (rtc);s3c_rtc_setpie (&dev->dev,0 ); -s3c_rtc_setaie (0 ); +s3c_rtc_setaie (&dev->dev,0 );clk_disable (rtc_clk);clk_put (rtc_clk);
Signature · 1 line
1.7.2.3
PATCH 10/10 RTC S3C: Fix type of s3c_rtc_setaie()
Quoted 4 lines · Yauhen Kharuzhy
Change
s3c_rtc_setaie()declaration in accordance withrtc_class_opsstructure declaration.
Hi,
According to your patch description, this should be regarding fix s3c_rtc_setaie().
But includes others :-(
Please make sure your patch has no problem before submitting. As a note, already has been submitted about fix s3c_rtc_setaie().
Review
Quoted 30 lines
Signed-off-by Yauhen Kharuzhy <[email protected]>--- arch/arm/mach-s3c2412/Kconfig | 7 +++++++ arch/arm/mach-s3c2412/Makefile | 3 ++- arch/arm/mach-s3c2416/Kconfig | 1 + drivers/rtc/rtc-s3c.c | 8 +++++--- 4 files changed, 15 insertions(+), 4 deletions(-)arch/arm/mach-s3c2412/Kconfig +7
-0@@ -28,9 +28,16 @@ config S3C2412_DMA config S3C2412_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2412 power management +config S3C2412_PM_SLEEP + bool + help + Internal config node to apply sleep for S3C2412 power management. + Can be selected by another SoCs with similar sleep procedure. + # Note, the S3C2412 IOtiming support is in plat-s3c24xx config S3C2412_CPUFREQ(quoted diff) +0
-0
b/arch/arm/mach-s3c2412/Makefile
Quoted 66 lines
index 530ec46..6c48a91 100644
arch/arm/mach-s3c2412/Makefile +2
-1@@ -14,7 +14,8 @@ obj-$(CONFIG_CPU_S3C2412) += irq.o obj-$(CONFIG_CPU_S3C2412) += clock.o obj-$(CONFIG_CPU_S3C2412) += gpio.o obj-$(CONFIG_S3C2412_DMA) += dma.o -obj-$(CONFIG_S3C2412_PM) += pm.o sleep.o +obj-$(CONFIG_S3C2412_PM) += pm.o +obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep.o obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o # Machine supportarch/arm/mach-s3c2416/Kconfig +1
-0@@ -27,6 +27,7 @@ config S3C2416_DMA config S3C2416_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2416 power managementdrivers/rtc/rtc-s3c.c +4
-2@@ -77,7 +77,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id) }/* Update control registers */ -static void s3c_rtc_setaie (int to) +static int s3c_rtc_setaie (struct device *dev,unsigned int to) {unsigned int tmp;@@ -89,6 +89,8 @@ static void s3c_rtc_setaie(int to) tmp |=S3C2410_RTCALM_ALMEN ;writeb (tmp, s3c_rtc_base +S3C2410_RTCALM ); + +return 0 ; }static int s3c_rtc_setpie (struct device *dev,int enabled)@@ -308,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) writeb(alrm_en, base + S3C2410_RTCALM); -s3c_rtc_setaie (alrm->enabled); +s3c_rtc_setaie (dev, alrm->enabled);return 0 ;}
drivers/rtc/rtc-s3c.c +1
-1@@ -440,7 +442,7 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)rtc_device_unregister (rtc );s3c_rtc_setpie (&dev->dev,0 ); -s3c_rtc_setaie (0 ); +s3c_rtc_setaie (&dev->dev,0 );clk_disable (rtc_clk);
Quoted 2 lines
clk_put(rtc_clk);
--
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 10/10 RTC S3C: Fix type of s3c_rtc_setaie()
Quoted 10 lines · Kukjin Kim
Quoted 4 lines · Yauhen Kharuzhy
Change
s3c_rtc_setaie()declaration in accordance withrtc_class_opsstructure declaration.Hi,
According to your patch description, this should be regarding fix
s3c_rtc_setaie().
But includes others :-(
I am sorry, my mistake after reorder of my patches. OK, I will re-sent patch for S3C2412/S3C2416 PM separately.
Quoted 113 lines
Please make sure your patch has no problem before submitting. As a note, already has been submitted about fix
s3c_rtc_setaie().Review
Quoted 30 lines
Signed-off-by Yauhen Kharuzhy <[email protected]>--- arch/arm/mach-s3c2412/Kconfig | 7 +++++++ arch/arm/mach-s3c2412/Makefile | 3 ++- arch/arm/mach-s3c2416/Kconfig | 1 + drivers/rtc/rtc-s3c.c | 8 +++++--- 4 files changed, 15 insertions(+), 4 deletions(-)arch/arm/mach-s3c2412/Kconfig +7
-0@@ -28,9 +28,16 @@ config S3C2412_DMA config S3C2412_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2412 power management +config S3C2412_PM_SLEEP + bool + help + Internal config node to apply sleep for S3C2412 power management. + Can be selected by another SoCs with similar sleep procedure. + # Note, the S3C2412 IOtiming support is in plat-s3c24xx config S3C2412_CPUFREQ(quoted diff) +0
-0b/arch/arm/mach-s3c2412/Makefile
Quoted 66 lines
index 530ec46..6c48a91 100644
arch/arm/mach-s3c2412/Makefile +2
-1@@ -14,7 +14,8 @@ obj-$(CONFIG_CPU_S3C2412) += irq.o obj-$(CONFIG_CPU_S3C2412) += clock.o obj-$(CONFIG_CPU_S3C2412) += gpio.o obj-$(CONFIG_S3C2412_DMA) += dma.o -obj-$(CONFIG_S3C2412_PM) += pm.o sleep.o +obj-$(CONFIG_S3C2412_PM) += pm.o +obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep.o obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o # Machine supportarch/arm/mach-s3c2416/Kconfig +1
-0@@ -27,6 +27,7 @@ config S3C2416_DMA config S3C2416_PM bool + select S3C2412_PM_SLEEP help Internal config node to apply S3C2416 power managementdrivers/rtc/rtc-s3c.c +4
-2@@ -77,7 +77,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id) }/* Update control registers */ -static void s3c_rtc_setaie (int to) +static int s3c_rtc_setaie (struct device *dev,unsigned int to) {unsigned int tmp;@@ -89,6 +89,8 @@ static void s3c_rtc_setaie(int to) tmp |=S3C2410_RTCALM_ALMEN ;writeb (tmp, s3c_rtc_base +S3C2410_RTCALM ); + +return 0 ; }static int s3c_rtc_setpie (struct device *dev,int enabled)@@ -308,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) writeb(alrm_en, base + S3C2410_RTCALM); -s3c_rtc_setaie (alrm->enabled); +s3c_rtc_setaie (dev, alrm->enabled);return 0 ;}
drivers/rtc/rtc-s3c.c +1
-1@@ -440,7 +442,7 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)rtc_device_unregister (rtc );s3c_rtc_setpie (&dev->dev,0 ); -s3c_rtc_setaie (0 ); +s3c_rtc_setaie (&dev->dev,0 );clk_disable (rtc_clk);Quoted 2 lines
clk_put(rtc_clk);
--Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Signature · 5 lines
Yauhen Kharuzhy jekhor _at_ gmail.com JID: jek at jabber.ru A: No Q: Should I quote below my post?