Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec38a03 authored by Axel Lin's avatar Axel Lin Committed by Linus Torvalds
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 212e3499

drivers/rtc/rtc-s3c.c

+7 −5
Original line number Diff line number Diff line
@@ -77,18 +77,20 @@ 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 enabled)

{

	unsigned int tmp;



	pr_debug("%s: aie=%d\n", __func__, to);

	pr_debug("%s: aie=%d\n", __func__, enabled);



	tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;



	if (to)

	if (enabled)

		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);