projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: DEC: Convert to new irq_chip functions
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
dec
/
kn02-irq.c
diff --git
a/arch/mips/dec/kn02-irq.c
b/arch/mips/dec/kn02-irq.c
index ed90a8deabccf78d57c23eb956354fd2b205c262..ef31d98c4fb8dd01622505345b0fec9ced62b009 100644
(file)
--- a/
arch/mips/dec/kn02-irq.c
+++ b/
arch/mips/dec/kn02-irq.c
@@
-27,43
+27,40
@@
*/
u32 cached_kn02_csr;
*/
u32 cached_kn02_csr;
-
static int kn02_irq_base;
static int kn02_irq_base;
-
-static inline void unmask_kn02_irq(unsigned int irq)
+static void unmask_kn02_irq(struct irq_data *d)
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR);
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR);
- cached_kn02_csr |= (1 << (irq - kn02_irq_base + 16));
+ cached_kn02_csr |= (1 << (
d->
irq - kn02_irq_base + 16));
*csr = cached_kn02_csr;
}
*csr = cached_kn02_csr;
}
-static
inline void mask_kn02_irq(unsigned int irq
)
+static
void mask_kn02_irq(struct irq_data *d
)
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR);
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
KN02_CSR);
- cached_kn02_csr &= ~(1 << (irq - kn02_irq_base + 16));
+ cached_kn02_csr &= ~(1 << (
d->
irq - kn02_irq_base + 16));
*csr = cached_kn02_csr;
}
*csr = cached_kn02_csr;
}
-static void ack_kn02_irq(
unsigned int irq
)
+static void ack_kn02_irq(
struct irq_data *d
)
{
{
- mask_kn02_irq(
irq
);
+ mask_kn02_irq(
d
);
iob();
}
static struct irq_chip kn02_irq_type = {
.name = "KN02-CSR",
iob();
}
static struct irq_chip kn02_irq_type = {
.name = "KN02-CSR",
- .ack = ack_kn02_irq,
- .mask = mask_kn02_irq,
- .mask_ack = ack_kn02_irq,
- .unmask = unmask_kn02_irq,
+ .
irq_
ack = ack_kn02_irq,
+ .
irq_
mask = mask_kn02_irq,
+ .
irq_
mask_ack = ack_kn02_irq,
+ .
irq_
unmask = unmask_kn02_irq,
};
};
-
void __init init_kn02_irqs(int base)
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
void __init init_kn02_irqs(int base)
{
volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +