summaryrefslogtreecommitdiffstats
path: root/kernel/arch/powerpc/platforms/embedded6xx
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/powerpc/platforms/embedded6xx')
-rw-r--r--kernel/arch/powerpc/platforms/embedded6xx/flipper-pic.c3
-rw-r--r--kernel/arch/powerpc/platforms/embedded6xx/hlwd-pic.c5
-rw-r--r--kernel/arch/powerpc/platforms/embedded6xx/mvme5100.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/kernel/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 4cde8e7da..b7866e014 100644
--- a/kernel/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/kernel/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -108,7 +108,8 @@ static int flipper_pic_map(struct irq_domain *h, unsigned int virq,
return 0;
}
-static int flipper_pic_match(struct irq_domain *h, struct device_node *np)
+static int flipper_pic_match(struct irq_domain *h, struct device_node *np,
+ enum irq_domain_bus_token bus_token)
{
return 1;
}
diff --git a/kernel/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/kernel/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index c269caee5..9b7975706 100644
--- a/kernel/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/kernel/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -120,11 +120,10 @@ static unsigned int __hlwd_pic_get_irq(struct irq_domain *h)
return irq_linear_revmap(h, irq);
}
-static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
- struct irq_desc *desc)
+static void hlwd_pic_irq_cascade(struct irq_desc *desc)
{
struct irq_chip *chip = irq_desc_get_chip(desc);
- struct irq_domain *irq_domain = irq_get_handler_data(cascade_virq);
+ struct irq_domain *irq_domain = irq_desc_get_handler_data(desc);
unsigned int virq;
raw_spin_lock(&desc->lock);
diff --git a/kernel/arch/powerpc/platforms/embedded6xx/mvme5100.c b/kernel/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 161330317..8f65aa374 100644
--- a/kernel/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/kernel/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -42,7 +42,7 @@
static phys_addr_t pci_membase;
static u_char *restart;
-static void mvme5100_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void mvme5100_8259_cascade(struct irq_desc *desc)
{
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq();