Commit 10dd5ce2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove compatibility layer for ARM irqs 



set_irq_chipdata -> set_irq_chip_data
get_irq_chipdata -> get_irq_chip_data
do_level_IRQ -> handle_level_irq
do_edge_IRQ -> handle_edge_irq
do_simple_IRQ -> handle_simple_irq
irqdesc -> irq_desc
irqchip -> irq_chip

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 127e477e

arch/arm/common/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void __init gic_dist_init(void __iomem *base) 
	 */

	for (i = 29; i < max_irq; i++) {

		set_irq_chip(i, &gic_chip);

		set_irq_handler(i, do_level_IRQ);

		set_irq_handler(i, handle_level_irq);

		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);

	}

arch/arm/common/locomo.c

+42 −42
Original line number Diff line number Diff line
@@ -163,11 +163,11 @@ static struct locomo_dev_info locomo_devices[] = { 
#define	LOCOMO_IRQ_LT_START	(IRQ_LOCOMO_LT)

#define	LOCOMO_IRQ_SPI_START	(IRQ_LOCOMO_SPI_RFR)



static void locomo_handler(unsigned int irq, struct irqdesc *desc)

static void locomo_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irqdesc *d;

	void __iomem *mapbase = get_irq_chipdata(irq);

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	/* Acknowledge the parent IRQ */

	desc->chip->ack(irq);
@@ -194,7 +194,7 @@ static void locomo_ack_irq(unsigned int irq) 


static void locomo_mask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_ICR);

	r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
@@ -203,7 +203,7 @@ static void locomo_mask_irq(unsigned int irq) 


static void locomo_unmask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_ICR);

	r |= (0x0010 << (irq - LOCOMO_IRQ_START));
@@ -217,10 +217,10 @@ static struct irq_chip locomo_chip = { 
	.unmask	= locomo_unmask_irq,

};



static void locomo_key_handler(unsigned int irq, struct irqdesc *desc)

static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)

{

	struct irqdesc *d;

	void __iomem *mapbase = get_irq_chipdata(irq);

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_KEY_START;
@@ -230,7 +230,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc) 


static void locomo_key_ack_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);

	r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
@@ -239,7 +239,7 @@ static void locomo_key_ack_irq(unsigned int irq) 


static void locomo_key_mask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);

	r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -248,7 +248,7 @@ static void locomo_key_mask_irq(unsigned int irq) 


static void locomo_key_unmask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);

	r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -262,11 +262,11 @@ static struct irq_chip locomo_key_chip = { 
	.unmask	= locomo_key_unmask_irq,

};



static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc)

static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irqdesc *d;

	void __iomem *mapbase = get_irq_chipdata(irq);

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = 	locomo_readl(mapbase + LOCOMO_GIR) &

		locomo_readl(mapbase + LOCOMO_GPD) &
@@ -285,7 +285,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc) 


static void locomo_gpio_ack_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_GWE);

	r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -302,7 +302,7 @@ static void locomo_gpio_ack_irq(unsigned int irq) 


static void locomo_gpio_mask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_GIE);

	r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -311,7 +311,7 @@ static void locomo_gpio_mask_irq(unsigned int irq) 


static void locomo_gpio_unmask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_GIE);

	r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -325,10 +325,10 @@ static struct irq_chip locomo_gpio_chip = { 
	.unmask	= locomo_gpio_unmask_irq,

};



static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc)

static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)

{

	struct irqdesc *d;

	void __iomem *mapbase = get_irq_chipdata(irq);

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_LT_START;
@@ -338,7 +338,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc) 


static void locomo_lt_ack_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_LTINT);

	r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
@@ -347,7 +347,7 @@ static void locomo_lt_ack_irq(unsigned int irq) 


static void locomo_lt_mask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_LTINT);

	r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -356,7 +356,7 @@ static void locomo_lt_mask_irq(unsigned int irq) 


static void locomo_lt_unmask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_LTINT);

	r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -370,11 +370,11 @@ static struct irq_chip locomo_lt_chip = { 
	.unmask	= locomo_lt_unmask_irq,

};



static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc)

static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)

{

	int req, i;

	struct irqdesc *d;

	void __iomem *mapbase = get_irq_chipdata(irq);

	struct irq_desc *d;

	void __iomem *mapbase = get_irq_chip_data(irq);



	req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;

	if (req) {
@@ -391,7 +391,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc) 


static void locomo_spi_ack_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIWE);

	r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -408,7 +408,7 @@ static void locomo_spi_ack_irq(unsigned int irq) 


static void locomo_spi_mask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);

	r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -417,7 +417,7 @@ static void locomo_spi_mask_irq(unsigned int irq) 


static void locomo_spi_unmask_irq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned int r;

	r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);

	r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -440,55 +440,55 @@ static void locomo_setup_irq(struct locomo *lchip) 
	 * Install handler for IRQ_LOCOMO_HW.

	 */

	set_irq_type(lchip->irq, IRQT_FALLING);

	set_irq_chipdata(lchip->irq, irqbase);

	set_irq_chip_data(lchip->irq, irqbase);

	set_irq_chained_handler(lchip->irq, locomo_handler);



	/* Install handlers for IRQ_LOCOMO_*_BASE */

	set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);

	set_irq_chipdata(IRQ_LOCOMO_KEY_BASE, irqbase);

	set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase);

	set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);

	set_irq_flags(IRQ_LOCOMO_KEY_BASE, IRQF_VALID | IRQF_PROBE);



	set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);

	set_irq_chipdata(IRQ_LOCOMO_GPIO_BASE, irqbase);

	set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase);

	set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler);

	set_irq_flags(IRQ_LOCOMO_GPIO_BASE, IRQF_VALID | IRQF_PROBE);



	set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip);

	set_irq_chipdata(IRQ_LOCOMO_LT_BASE, irqbase);

	set_irq_chip_data(IRQ_LOCOMO_LT_BASE, irqbase);

	set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler);

	set_irq_flags(IRQ_LOCOMO_LT_BASE, IRQF_VALID | IRQF_PROBE);



	set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip);

	set_irq_chipdata(IRQ_LOCOMO_SPI_BASE, irqbase);

	set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase);

	set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);

	set_irq_flags(IRQ_LOCOMO_SPI_BASE, IRQF_VALID | IRQF_PROBE);



	/* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */

	set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);

	set_irq_chipdata(LOCOMO_IRQ_KEY_START, irqbase);

	set_irq_handler(LOCOMO_IRQ_KEY_START, do_edge_IRQ);

	set_irq_chip_data(LOCOMO_IRQ_KEY_START, irqbase);

	set_irq_handler(LOCOMO_IRQ_KEY_START, handle_edge_irq);

	set_irq_flags(LOCOMO_IRQ_KEY_START, IRQF_VALID | IRQF_PROBE);



	/* install handlers for IRQ_LOCOMO_GPIO_BASE generated interrupts */

	for (irq = LOCOMO_IRQ_GPIO_START; irq < LOCOMO_IRQ_GPIO_START + 16; irq++) {

		set_irq_chip(irq, &locomo_gpio_chip);

		set_irq_chipdata(irq, irqbase);

		set_irq_handler(irq, do_edge_IRQ);

		set_irq_chip_data(irq, irqbase);

		set_irq_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	/* install handlers for IRQ_LOCOMO_LT_BASE generated interrupts */

	set_irq_chip(LOCOMO_IRQ_LT_START, &locomo_lt_chip);

	set_irq_chipdata(LOCOMO_IRQ_LT_START, irqbase);

	set_irq_handler(LOCOMO_IRQ_LT_START, do_edge_IRQ);

	set_irq_chip_data(LOCOMO_IRQ_LT_START, irqbase);

	set_irq_handler(LOCOMO_IRQ_LT_START, handle_edge_irq);

	set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE);



	/* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */

	for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 3; irq++) {

		set_irq_chip(irq, &locomo_spi_chip);

		set_irq_chipdata(irq, irqbase);

		set_irq_handler(irq, do_edge_IRQ);

		set_irq_chip_data(irq, irqbase);

		set_irq_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}

}

arch/arm/common/sa1111.c

+15 −15
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *ho 
 * will call us again if there are more interrupts to process.

 */

static void

sa1111_irq_handler(unsigned int irq, struct irqdesc *desc)

sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	unsigned int stat0, stat1, i;

	void __iomem *base = get_irq_data(irq);
@@ -187,7 +187,7 @@ static void sa1111_ack_irq(unsigned int irq) 


static void sa1111_mask_lowirq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ie0;



	ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -197,7 +197,7 @@ static void sa1111_mask_lowirq(unsigned int irq) 


static void sa1111_unmask_lowirq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ie0;



	ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -215,7 +215,7 @@ static void sa1111_unmask_lowirq(unsigned int irq) 
static int sa1111_retrigger_lowirq(unsigned int irq)

{

	unsigned int mask = SA1111_IRQMASK_LO(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip0;

	int i;
@@ -236,7 +236,7 @@ static int sa1111_retrigger_lowirq(unsigned int irq) 
static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)

{

	unsigned int mask = SA1111_IRQMASK_LO(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip0;



	if (flags == IRQT_PROBE)
@@ -259,7 +259,7 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) 
static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)

{

	unsigned int mask = SA1111_IRQMASK_LO(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long we0;



	we0 = sa1111_readl(mapbase + SA1111_WAKEEN0);
@@ -284,7 +284,7 @@ static struct irq_chip sa1111_low_chip = { 


static void sa1111_mask_highirq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ie1;



	ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -294,7 +294,7 @@ static void sa1111_mask_highirq(unsigned int irq) 


static void sa1111_unmask_highirq(unsigned int irq)

{

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ie1;



	ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -312,7 +312,7 @@ static void sa1111_unmask_highirq(unsigned int irq) 
static int sa1111_retrigger_highirq(unsigned int irq)

{

	unsigned int mask = SA1111_IRQMASK_HI(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip1;

	int i;
@@ -333,7 +333,7 @@ static int sa1111_retrigger_highirq(unsigned int irq) 
static int sa1111_type_highirq(unsigned int irq, unsigned int flags)

{

	unsigned int mask = SA1111_IRQMASK_HI(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip1;



	if (flags == IRQT_PROBE)
@@ -356,7 +356,7 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags) 
static int sa1111_wake_highirq(unsigned int irq, unsigned int on)

{

	unsigned int mask = SA1111_IRQMASK_HI(irq);

	void __iomem *mapbase = get_irq_chipdata(irq);

	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long we1;



	we1 = sa1111_readl(mapbase + SA1111_WAKEEN1);
@@ -410,15 +410,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip) 


	for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {

		set_irq_chip(irq, &sa1111_low_chip);

		set_irq_chipdata(irq, irqbase);

		set_irq_handler(irq, do_edge_IRQ);

		set_irq_chip_data(irq, irqbase);

		set_irq_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {

		set_irq_chip(irq, &sa1111_high_chip);

		set_irq_chipdata(irq, irqbase);

		set_irq_handler(irq, do_edge_IRQ);

		set_irq_chip_data(irq, irqbase);

		set_irq_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}

arch/arm/common/vic.c

+4 −4
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ 


static void vic_mask_irq(unsigned int irq)

{

	void __iomem *base = get_irq_chipdata(irq);

	void __iomem *base = get_irq_chip_data(irq);

	irq &= 31;

	writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);

}



static void vic_unmask_irq(unsigned int irq)

{

	void __iomem *base = get_irq_chipdata(irq);

	void __iomem *base = get_irq_chip_data(irq);

	irq &= 31;

	writel(1 << irq, base + VIC_INT_ENABLE);

}
@@ -88,10 +88,10 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, 
		unsigned int irq = irq_start + i;



		set_irq_chip(irq, &vic_chip);

		set_irq_chipdata(irq, base);

		set_irq_chip_data(irq, base);



		if (vic_sources & (1 << i)) {

			set_irq_handler(irq, do_level_IRQ);

			set_irq_handler(irq, handle_level_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		}

	}

arch/arm/kernel/ecard.c

+5 −5
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static void ecard_dump_irq_state(void) 
	}

}



static void ecard_check_lockup(struct irqdesc *desc)

static void ecard_check_lockup(struct irq_desc *desc)

{

	static unsigned long last;

	static int lockup;
@@ -567,7 +567,7 @@ static void ecard_check_lockup(struct irqdesc *desc) 
}



static void

ecard_irq_handler(unsigned int irq, struct irqdesc *desc)

ecard_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	ecard_t *ec;

	int called = 0;
@@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc) 
			pending = ecard_default_ops.irqpending(ec);



		if (pending) {

			struct irqdesc *d = irq_desc + ec->irq;

			struct irq_desc *d = irq_desc + ec->irq;

			desc_handle_irq(ec->irq, d);

			called ++;

		}
@@ -609,7 +609,7 @@ static unsigned char first_set[] = 
};



static void

ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc)

ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)

{

	const unsigned int statusmask = 15;

	unsigned int status;
@@ -1022,7 +1022,7 @@ ecard_probe(int slot, card_type_t type) 
	if (slot < 8) {

		ec->irq = 32 + slot;

		set_irq_chip(ec->irq, &ecard_chip);

		set_irq_handler(ec->irq, do_level_IRQ);

		set_irq_handler(ec->irq, handle_level_irq);

		set_irq_flags(ec->irq, IRQF_VALID);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE