git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] pxa: use <linux/gpio.h> instead of unnecessary <mach/gpio.h>
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-ebsa110
/
core.c
diff --git
a/arch/arm/mach-ebsa110/core.c
b/arch/arm/mach-ebsa110/core.c
index
6d620d8
..
c7bc7fb
100644
(file)
--- a/
arch/arm/mach-ebsa110/core.c
+++ b/
arch/arm/mach-ebsa110/core.c
@@
-14,10
+14,10
@@
#include <linux/interrupt.h>
#include <linux/serial_8250.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/serial_8250.h>
#include <linux/init.h>
+#include <linux/io.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/irq.h>
#include <asm/irq.h>
-#include <asm/io.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/pgtable.h>
@@
-45,7
+45,7
@@
static void ebsa110_unmask_irq(unsigned int irq)
__raw_writeb(1 << irq, IRQ_MSET);
}
__raw_writeb(1 << irq, IRQ_MSET);
}
-static struct irqchip ebsa110_irq_chip = {
+static struct irq
_
chip ebsa110_irq_chip = {
.ack = ebsa110_mask_irq,
.mask = ebsa110_mask_irq,
.unmask = ebsa110_unmask_irq,
.ack = ebsa110_mask_irq,
.mask = ebsa110_mask_irq,
.unmask = ebsa110_unmask_irq,
@@
-67,7
+67,7
@@
static void __init ebsa110_init_irq(void)
for (irq = 0; irq < NR_IRQS; irq++) {
set_irq_chip(irq, &ebsa110_irq_chip);
for (irq = 0; irq < NR_IRQS; irq++) {
set_irq_chip(irq, &ebsa110_irq_chip);
- set_irq_handler(irq,
do_level_IRQ
);
+ set_irq_handler(irq,
handle_level_irq
);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
@@
-174,12
+174,10
@@
static unsigned long ebsa110_gettimeoffset(void)
}
static irqreturn_t
}
static irqreturn_t
-ebsa110_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+ebsa110_timer_interrupt(int irq, void *dev_id)
{
u32 count;
{
u32 count;
- write_seqlock(&xtime_lock);
-
/* latch and read timer 1 */
__raw_writeb(0x40, PIT_CTRL);
count = __raw_readb(PIT_T1);
/* latch and read timer 1 */
__raw_writeb(0x40, PIT_CTRL);
count = __raw_readb(PIT_T1);
@@
-190,16
+188,14
@@
ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
__raw_writeb(count & 0xff, PIT_T1);
__raw_writeb(count >> 8, PIT_T1);
__raw_writeb(count & 0xff, PIT_T1);
__raw_writeb(count >> 8, PIT_T1);
- timer_tick(regs);
-
- write_sequnlock(&xtime_lock);
+ timer_tick();
return IRQ_HANDLED;
}
static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
return IRQ_HANDLED;
}
static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
- .flags =
SA_INTERRUPT | SA_TIMER
,
+ .flags =
IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL
,
.handler = ebsa110_timer_interrupt,
};
.handler = ebsa110_timer_interrupt,
};