[PATCH] move rtc_interrupt() prototype to rtc.h
This patch moves the rtc_interrupt() prototype to rtc.h and removes the prototypes from C files. It also renames static rtc_interrupt() functions in arch/arm/mach-integrator/time.c and arch/sh64/kernel/time.c to avoid compile problems. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Paul Gortmaker <p_gortmaker@yahoo.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
这个提交包含在:
@@ -96,7 +96,8 @@ static struct rtc_ops rtc_ops = {
|
||||
.set_alarm = rtc_set_alarm,
|
||||
};
|
||||
|
||||
static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
writel(0, rtc_base + RTC_EOI);
|
||||
return IRQ_HANDLED;
|
||||
@@ -124,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id)
|
||||
|
||||
xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
|
||||
|
||||
ret = request_irq(dev->irq[0], rtc_interrupt, SA_INTERRUPT,
|
||||
ret = request_irq(dev->irq[0], arm_rtc_interrupt, SA_INTERRUPT,
|
||||
"rtc-pl030", dev);
|
||||
if (ret)
|
||||
goto map_out;
|
||||
|
在新工单中引用
屏蔽一个用户