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
arm: Cleanup the irq namespace
[pandora-kernel.git]
/
arch
/
arm
/
common
/
gic.c
diff --git
a/arch/arm/common/gic.c
b/arch/arm/common/gic.c
index
cb6b041
..
50d5b20
100644
(file)
--- a/
arch/arm/common/gic.c
+++ b/
arch/arm/common/gic.c
@@
-213,8
+213,8
@@
static int gic_set_wake(struct irq_data *d, unsigned int on)
static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
{
static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
{
- struct gic_chip_data *chip_data =
get_irq
_data(irq);
- struct irq_chip *chip =
get_irq
_chip(irq);
+ struct gic_chip_data *chip_data =
irq_get_handler
_data(irq);
+ struct irq_chip *chip =
irq_get
_chip(irq);
unsigned int cascade_irq, gic_irq;
unsigned long status;
unsigned int cascade_irq, gic_irq;
unsigned long status;
@@
-257,9
+257,9
@@
void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)
{
if (gic_nr >= MAX_GIC_NR)
BUG();
{
if (gic_nr >= MAX_GIC_NR)
BUG();
- if (
set_irq
_data(irq, &gic_data[gic_nr]) != 0)
+ if (
irq_set_handler
_data(irq, &gic_data[gic_nr]) != 0)
BUG();
BUG();
-
set_irq
_chained_handler(irq, gic_handle_cascade_irq);
+
irq_set
_chained_handler(irq, gic_handle_cascade_irq);
}
static void __init gic_dist_init(struct gic_chip_data *gic,
}
static void __init gic_dist_init(struct gic_chip_data *gic,
@@
-319,9
+319,9
@@
static void __init gic_dist_init(struct gic_chip_data *gic,
* Setup the Linux IRQ subsystem.
*/
for (i = irq_start; i < irq_limit; i++) {
* Setup the Linux IRQ subsystem.
*/
for (i = irq_start; i < irq_limit; i++) {
-
set_irq
_chip(i, &gic_chip);
-
set_irq
_chip_data(i, gic);
-
set_irq
_handler(i, handle_level_irq);
+
irq_set
_chip(i, &gic_chip);
+
irq_set
_chip_data(i, gic);
+
irq_set
_handler(i, handle_level_irq);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
@@
-382,7
+382,7
@@
void __cpuinit gic_enable_ppi(unsigned int irq)
unsigned long flags;
local_irq_save(flags);
unsigned long flags;
local_irq_save(flags);
- irq_
to_desc(irq)->status |= IRQ_NOPROBE
;
+ irq_
set_status_flags(irq, IRQ_NOPROBE)
;
gic_unmask_irq(irq_get_irq_data(irq));
local_irq_restore(flags);
}
gic_unmask_irq(irq_get_irq_data(irq));
local_irq_restore(flags);
}