projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'edac/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/linux.git]
/
arch
/
mips
/
pci
/
pci-rt3883.c
diff --git
a/arch/mips/pci/pci-rt3883.c
b/arch/mips/pci/pci-rt3883.c
index
80fafe6
..
53c8efa
100644
(file)
--- a/
arch/mips/pci/pci-rt3883.c
+++ b/
arch/mips/pci/pci-rt3883.c
@@
-129,7
+129,7
@@
static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,
rt3883_pci_w32(rpc, val, RT3883_PCI_REG_CFGDATA);
}
rt3883_pci_w32(rpc, val, RT3883_PCI_REG_CFGDATA);
}
-static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void rt3883_pci_irq_handler(unsigned int
__
irq, struct irq_desc *desc)
{
struct rt3883_pci_controller *rpc;
u32 pending;
{
struct rt3883_pci_controller *rpc;
u32 pending;
@@
-145,7
+145,7
@@
static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
}
while (pending) {
}
while (pending) {
- unsigned bit = __ffs(pending);
+ unsigned
irq,
bit = __ffs(pending);
irq = irq_find_mapping(rpc->irq_domain, bit);
generic_handle_irq(irq);
irq = irq_find_mapping(rpc->irq_domain, bit);
generic_handle_irq(irq);
@@
-225,8
+225,7
@@
static int rt3883_pci_irq_init(struct device *dev,
return -ENODEV;
}
return -ENODEV;
}
- irq_set_handler_data(irq, rpc);
- irq_set_chained_handler(irq, rt3883_pci_irq_handler);
+ irq_set_chained_handler_and_data(irq, rt3883_pci_irq_handler, rpc);
return 0;
}
return 0;
}