git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-h720x
/
cpu-h7202.c
diff --git
a/arch/arm/mach-h720x/cpu-h7202.c
b/arch/arm/mach-h720x/cpu-h7202.c
index
a4a7c01
..
703870f
100644
(file)
--- a/
arch/arm/mach-h720x/cpu-h7202.c
+++ b/
arch/arm/mach-h720x/cpu-h7202.c
@@
-106,8
+106,7
@@
static struct platform_device *devices[] __initdata = {
* we have to handle all timer interrupts in one place.
*/
static void
* we have to handle all timer interrupts in one place.
*/
static void
-h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
- struct pt_regs *regs)
+h7202_timerx_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
{
unsigned int mask, irq;
{
unsigned int mask, irq;
@@
-115,7
+114,7
@@
h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
if ( mask & TSTAT_T0INT ) {
write_seqlock(&xtime_lock);
if ( mask & TSTAT_T0INT ) {
write_seqlock(&xtime_lock);
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);
if( mask == TSTAT_T0INT )
return;
write_sequnlock(&xtime_lock);
if( mask == TSTAT_T0INT )
return;
@@
-126,7
+125,7
@@
h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
desc = irq_desc + irq;
while (mask) {
if (mask & 1)
desc = irq_desc + irq;
while (mask) {
if (mask & 1)
- desc_handle_irq(irq, desc
, regs
);
+ desc_handle_irq(irq, desc);
irq++;
desc++;
mask >>= 1;
irq++;
desc++;
mask >>= 1;
@@
-137,9
+136,9
@@
h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
* Timer interrupt handler
*/
static irqreturn_t
* Timer interrupt handler
*/
static irqreturn_t
-h7202_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+h7202_timer_interrupt(int irq, void *dev_id)
{
{
- h7202_timerx_demux_handler(0, NULL
, regs
);
+ h7202_timerx_demux_handler(0, NULL);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-163,7
+162,7
@@
static void inline unmask_timerx_irq (u32 irq)
CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit;
}
CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit;
}
-static struct irqchip h7202_timerx_chip = {
+static struct irq
_
chip h7202_timerx_chip = {
.ack = mask_timerx_irq,
.mask = mask_timerx_irq,
.unmask = unmask_timerx_irq,
.ack = mask_timerx_irq,
.mask = mask_timerx_irq,
.unmask = unmask_timerx_irq,
@@
-171,7
+170,7
@@
static struct irqchip h7202_timerx_chip = {
static struct irqaction h7202_timer_irq = {
.name = "h7202 Timer Tick",
static struct irqaction h7202_timer_irq = {
.name = "h7202 Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = h7202_timer_interrupt,
};
.handler = h7202_timer_interrupt,
};
@@
-203,7
+202,7
@@
void __init h7202_init_irq (void)
irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) {
mask_timerx_irq(irq);
set_irq_chip(irq, &h7202_timerx_chip);
irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) {
mask_timerx_irq(irq);
set_irq_chip(irq, &h7202_timerx_chip);
- set_irq_handler(irq,
do_edge_IRQ
);
+ set_irq_handler(irq,
handle_edge_irq
);
set_irq_flags(irq, IRQF_VALID );
}
set_irq_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler);
set_irq_flags(irq, IRQF_VALID );
}
set_irq_chained_handler(IRQ_TIMERX, h7202_timerx_demux_handler);