dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion 

This platform has not been converted to 'struct irq_data' when the big
pile was done and fails to compile nowadays. Tested on a JayPC-Tablet.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Alexey Charkov <alchark@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Wolfram Sang 2011-06-28 09:53:20 +01:00 committed by Russell King
parent 0371d3f7e8
commit 2eb5af44b1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-vt8500/irq.c
View File

@ -39,9 +39,10 @@
static void __iomem *ic_regbase; static void __iomem *ic_regbase;
static void __iomem *sic_regbase; static void __iomem *sic_regbase;
static void vt8500_irq_mask(unsigned int irq) static void vt8500_irq_mask(struct irq_data *d)
{ {
void __iomem *base = ic_regbase; void __iomem *base = ic_regbase;
unsigned irq = d->irq;
u8 edge; u8 edge;
if (irq >= 64) { if (irq >= 64) {
@ -64,9 +65,10 @@ static void vt8500_irq_mask(unsigned int irq)
} }
} }
static void vt8500_irq_unmask(unsigned int irq) static void vt8500_irq_unmask(struct irq_data *d)
{ {
void __iomem *base = ic_regbase; void __iomem *base = ic_regbase;
unsigned irq = d->irq;
u8 dctr; u8 dctr;
if (irq >= 64) { if (irq >= 64) {
@ -78,10 +80,11 @@ static void vt8500_irq_unmask(unsigned int irq)
writeb(dctr, base + VT8500_IC_DCTR + irq); writeb(dctr, base + VT8500_IC_DCTR + irq);
} }
static int vt8500_irq_set_type(unsigned int irq, unsigned int flow_type) static int vt8500_irq_set_type(struct irq_data *d, unsigned int flow_type)
{ {
void __iomem *base = ic_regbase; void __iomem *base = ic_regbase;
unsigned int orig_irq = irq; unsigned irq = d->irq;
unsigned orig_irq = irq;
u8 dctr; u8 dctr;
if (irq >= 64) { if (irq >= 64) {
@ -114,11 +117,11 @@ static int vt8500_irq_set_type(unsigned int irq, unsigned int flow_type)
} }
static struct irq_chip vt8500_irq_chip = { static struct irq_chip vt8500_irq_chip = {
.name = "vt8500", .name = "vt8500",
.ack = vt8500_irq_mask, .irq_ack = vt8500_irq_mask,
.mask = vt8500_irq_mask, .irq_mask = vt8500_irq_mask,
.unmask = vt8500_irq_unmask, .irq_unmask = vt8500_irq_unmask,
.set_type = vt8500_irq_set_type, .irq_set_type = vt8500_irq_set_type,
}; };
void __init vt8500_init_irq(void) void __init vt8500_init_irq(void)