redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

frv: Convert mb93493 irq_chip to new functions 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>
wifi-calibration
Thomas Gleixner 2011-03-29 14:05:13 +01:00 committed by David Howells
parent 9148d88b12
commit a4b48a494a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/frv/kernel/irq-mb93493.c
View File

@ -45,46 +45,46 @@
* daughter board PIC operations * daughter board PIC operations
* - there is no way to ACK interrupts in the MB93493 chip * - there is no way to ACK interrupts in the MB93493 chip
*/ */
static void frv_mb93493_mask(unsigned int irq) static void frv_mb93493_mask(struct irq_data *d)
{ {
uint32_t iqsr; uint32_t iqsr;
volatile void *piqsr; volatile void *piqsr;
if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493))) if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))
piqsr = __addr_MB93493_IQSR(1); piqsr = __addr_MB93493_IQSR(1);
else else
piqsr = __addr_MB93493_IQSR(0); piqsr = __addr_MB93493_IQSR(0);
iqsr = readl(piqsr); iqsr = readl(piqsr);
iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16)); iqsr &= ~(1 << (d->irq - IRQ_BASE_MB93493 + 16));
writel(iqsr, piqsr); writel(iqsr, piqsr);
} }
static void frv_mb93493_ack(unsigned int irq) static void frv_mb93493_ack(struct irq_data *d)
{ {
} }
static void frv_mb93493_unmask(unsigned int irq) static void frv_mb93493_unmask(struct irq_data *d)
{ {
uint32_t iqsr; uint32_t iqsr;
volatile void *piqsr; volatile void *piqsr;
if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493))) if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493)))
piqsr = __addr_MB93493_IQSR(1); piqsr = __addr_MB93493_IQSR(1);
else else
piqsr = __addr_MB93493_IQSR(0); piqsr = __addr_MB93493_IQSR(0);
iqsr = readl(piqsr); iqsr = readl(piqsr);
iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16); iqsr |= 1 << (d->irq - IRQ_BASE_MB93493 + 16);
writel(iqsr, piqsr); writel(iqsr, piqsr);
} }
static struct irq_chip frv_mb93493_pic = { static struct irq_chip frv_mb93493_pic = {
.name = "mb93093", .name = "mb93093",
.ack = frv_mb93493_ack, .irq_ack = frv_mb93493_ack,
.mask = frv_mb93493_mask, .irq_mask = frv_mb93493_mask,
.mask_ack = frv_mb93493_mask, .irq_mask_ack = frv_mb93493_mask,
.unmask = frv_mb93493_unmask, .irq_unmask = frv_mb93493_unmask,
}; };
/* /*