tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drivers/rtc/rtc-s3c.c: fix prototype for s3c_rtc_setaie()

Fix s3c_rtc_setaie() prototype to eliminate the following compile
warning:

drivers/rtc/rtc-s3c.c:383: warning: initialization from incompatible pointer type

(akpm: the rtc_class_ops.alarm_irq_enable() handler is being passed two
arguments where it expects just one, presumably with undesired effects)

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Axel Lin and committed by
Linus Torvalds 2ec38a03 212e3499

+7 -5
+7 -5
drivers/rtc/rtc-s3c.c
··· 77 77 } 78 78 79 79 /* Update control registers */ 80 - static void s3c_rtc_setaie(int to) 80 + static int s3c_rtc_setaie(struct device *dev, unsigned int enabled) 81 81 { 82 82 unsigned int tmp; 83 83 84 - pr_debug("%s: aie=%d\n", __func__, to); 84 + pr_debug("%s: aie=%d\n", __func__, enabled); 85 85 86 86 tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN; 87 87 88 - if (to) 88 + if (enabled) 89 89 tmp |= S3C2410_RTCALM_ALMEN; 90 90 91 91 writeb(tmp, s3c_rtc_base + S3C2410_RTCALM); 92 + 93 + return 0; 92 94 } 93 95 94 96 static int s3c_rtc_setpie(struct device *dev, int enabled) ··· 310 308 311 309 writeb(alrm_en, base + S3C2410_RTCALM); 312 310 313 - s3c_rtc_setaie(alrm->enabled); 311 + s3c_rtc_setaie(dev, alrm->enabled); 314 312 315 313 return 0; 316 314 } ··· 442 440 rtc_device_unregister(rtc); 443 441 444 442 s3c_rtc_setpie(&dev->dev, 0); 445 - s3c_rtc_setaie(0); 443 + s3c_rtc_setaie(&dev->dev, 0); 446 444 447 445 clk_disable(rtc_clk); 448 446 clk_put(rtc_clk);