Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30e1521 authored by Wolfram Sang's avatar Wolfram Sang Committed by Arnd Bergmann
Browse files

arm: mach-vt8500: add forgotten irq_data conversion 



This platform has not been converted to 'struct irq_data' when the big
pile was done. It fails to compile nowadays, because the compatibility
code has gone.

  CC      arch/arm/mach-vt8500/irq.o
arch/arm/mach-vt8500/irq.c:118:2: error: unknown field 'ack' specified in initializer
arch/arm/mach-vt8500/irq.c:118:2: warning: initialization from incompatible pointer type
arch/arm/mach-vt8500/irq.c:119:2: error: unknown field 'mask' specified in initializer
arch/arm/mach-vt8500/irq.c:119:2: warning: initialization from incompatible pointer type
arch/arm/mach-vt8500/irq.c:120:2: error: unknown field 'unmask' specified in initializer
arch/arm/mach-vt8500/irq.c:120:2: warning: initialization from incompatible pointer type
arch/arm/mach-vt8500/irq.c:121:2: error: unknown field 'set_type' specified in initializer
arch/arm/mach-vt8500/irq.c:121:2: warning: initialization from incompatible pointer type
make[1]: *** [arch/arm/mach-vt8500/irq.o] Error 1

Add the missing conversion. Tested on a JayPC-Tablet.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarAlexey Charkov <alchark@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6662498e

arch/arm/mach-vt8500/irq.c

+12 −9
Original line number Original line Diff line number Diff line
@@ -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) {
@@ -115,10 +118,10 @@ 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)