Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
frv: Convert mb93493 irq_chip to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.401266547@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+11
-11
arch/frv/kernel/irq-mb93493.c
+11
-11
arch/frv/kernel/irq-mb93493.c
···
45
45
* daughter board PIC operations
46
46
* - there is no way to ACK interrupts in the MB93493 chip
47
47
*/
48
-
static void frv_mb93493_mask(unsigned int irq)
48
+
static void frv_mb93493_mask(struct irq_data *d)
49
49
{
50
50
uint32_t iqsr;
51
51
volatile void *piqsr;
52
52
53
-
if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493)))
53
+
if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))
54
54
piqsr = __addr_MB93493_IQSR(1);
55
55
else
56
56
piqsr = __addr_MB93493_IQSR(0);
57
57
58
58
iqsr = readl(piqsr);
59
-
iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16));
59
+
iqsr &= ~(1 << (d->irq - IRQ_BASE_MB93493 + 16));
60
60
writel(iqsr, piqsr);
61
61
}
62
62
63
-
static void frv_mb93493_ack(unsigned int irq)
63
+
static void frv_mb93493_ack(struct irq_data *d)
64
64
{
65
65
}
66
66
67
-
static void frv_mb93493_unmask(unsigned int irq)
67
+
static void frv_mb93493_unmask(struct irq_data *d)
68
68
{
69
69
uint32_t iqsr;
70
70
volatile void *piqsr;
71
71
72
-
if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493)))
72
+
if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))
73
73
piqsr = __addr_MB93493_IQSR(1);
74
74
else
75
75
piqsr = __addr_MB93493_IQSR(0);
76
76
77
77
iqsr = readl(piqsr);
78
-
iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16);
78
+
iqsr |= 1 << (d->irq - IRQ_BASE_MB93493 + 16);
79
79
writel(iqsr, piqsr);
80
80
}
81
81
82
82
static struct irq_chip frv_mb93493_pic = {
83
83
.name = "mb93093",
84
-
.ack = frv_mb93493_ack,
85
-
.mask = frv_mb93493_mask,
86
-
.mask_ack = frv_mb93493_mask,
87
-
.unmask = frv_mb93493_unmask,
84
+
.irq_ack = frv_mb93493_ack,
85
+
.irq_mask = frv_mb93493_mask,
86
+
.irq_mask_ack = frv_mb93493_mask,
87
+
.irq_unmask = frv_mb93493_unmask,
88
88
};
89
89
90
90
/*