git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
sh
/
boards
/
mach-dreamcast
/
irq.c
diff --git
a/arch/sh/boards/mach-dreamcast/irq.c
b/arch/sh/boards/mach-dreamcast/irq.c
index
d932667
..
72e7ac9
100644
(file)
--- a/
arch/sh/boards/mach-dreamcast/irq.c
+++ b/
arch/sh/boards/mach-dreamcast/irq.c
@@
-60,8
+60,9
@@
*/
/* Disable the hardware event by masking its bit in its EMR */
*/
/* Disable the hardware event by masking its bit in its EMR */
-static inline void disable_systemasic_irq(
unsigned int irq
)
+static inline void disable_systemasic_irq(
struct irq_data *data
)
{
{
+ unsigned int irq = data->irq;
__u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
__u32 mask;
__u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
__u32 mask;
@@
-71,8
+72,9
@@
static inline void disable_systemasic_irq(unsigned int irq)
}
/* Enable the hardware event by setting its bit in its EMR */
}
/* Enable the hardware event by setting its bit in its EMR */
-static inline void enable_systemasic_irq(
unsigned int irq
)
+static inline void enable_systemasic_irq(
struct irq_data *data
)
{
{
+ unsigned int irq = data->irq;
__u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
__u32 mask;
__u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
__u32 mask;
@@
-82,18
+84,19
@@
static inline void enable_systemasic_irq(unsigned int irq)
}
/* Acknowledge a hardware event by writing its bit back to its ESR */
}
/* Acknowledge a hardware event by writing its bit back to its ESR */
-static void mask_ack_systemasic_irq(
unsigned int irq
)
+static void mask_ack_systemasic_irq(
struct irq_data *data
)
{
{
+ unsigned int irq = data->irq;
__u32 esr = ESR_BASE + (LEVEL(irq) << 2);
__u32 esr = ESR_BASE + (LEVEL(irq) << 2);
- disable_systemasic_irq(
irq
);
+ disable_systemasic_irq(
data
);
outl((1 << EVENT_BIT(irq)), esr);
}
struct irq_chip systemasic_int = {
.name = "System ASIC",
outl((1 << EVENT_BIT(irq)), esr);
}
struct irq_chip systemasic_int = {
.name = "System ASIC",
- .
mask
= disable_systemasic_irq,
- .
mask_ack
= mask_ack_systemasic_irq,
- .
unmask
= enable_systemasic_irq,
+ .
irq_mask
= disable_systemasic_irq,
+ .
irq_mask_ack
= mask_ack_systemasic_irq,
+ .
irq_unmask
= enable_systemasic_irq,
};
/*
};
/*