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

Commit 6cab4860 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_* 



IRQT_* and __IRQT_* were obsoleted long ago by patch [3692/1].
Remove them completely. Sed script for the reference:

s/__IRQT_RISEDGE/IRQ_TYPE_EDGE_RISING/g
s/__IRQT_FALEDGE/IRQ_TYPE_EDGE_FALLING/g
s/__IRQT_LOWLVL/IRQ_TYPE_LEVEL_LOW/g
s/__IRQT_HIGHLVL/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_RISING/IRQ_TYPE_EDGE_RISING/g
s/IRQT_FALLING/IRQ_TYPE_EDGE_FALLING/g
s/IRQT_BOTHEDGE/IRQ_TYPE_EDGE_BOTH/g
s/IRQT_LOW/IRQ_TYPE_LEVEL_LOW/g
s/IRQT_HIGH/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_PROBE/IRQ_TYPE_PROBE/g
s/IRQT_NOEDGE/IRQ_TYPE_NONE/g

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d9ecdb28

Documentation/arm/Interrupts

+2 −8
Original line number Diff line number Diff line
@@ -138,14 +138,8 @@ So, what's changed? 


                Set active the IRQ edge(s)/level.  This replaces the

                SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge()

                function.  Type should be one of the following:



                #define IRQT_NOEDGE     (0)

                #define IRQT_RISING     (__IRQT_RISEDGE)

                #define IRQT_FALLING    (__IRQT_FALEDGE)

                #define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)

                #define IRQT_LOW        (__IRQT_LOWLVL)

                #define IRQT_HIGH       (__IRQT_HIGHLVL)

                function.  Type should be one of IRQ_TYPE_xxx defined in

		<linux/irq.h>



3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.

arch/arm/common/locomo.c

+5 −5
Original line number Diff line number Diff line
@@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type) 


	mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);



	if (type == IRQT_PROBE) {

	if (type == IRQ_TYPE_PROBE) {

		if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)

			return 0;

		type = __IRQT_RISEDGE | __IRQT_FALEDGE;

		type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;

	}



	if (type & __IRQT_RISEDGE)

	if (type & IRQ_TYPE_EDGE_RISING)

		GPIO_IRQ_rising_edge |= mask;

	else

		GPIO_IRQ_rising_edge &= ~mask;

	if (type & __IRQT_FALEDGE)

	if (type & IRQ_TYPE_EDGE_FALLING)

		GPIO_IRQ_falling_edge |= mask;

	else

		GPIO_IRQ_falling_edge &= ~mask;
@@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip) 
	/*

	 * Install handler for IRQ_LOCOMO_HW.

	 */

	set_irq_type(lchip->irq, IRQT_FALLING);

	set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);

	set_irq_chip_data(lchip->irq, irqbase);

	set_irq_chained_handler(lchip->irq, locomo_handler);

arch/arm/common/sa1111.c

+7 −7
Original line number Diff line number Diff line
@@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) 
	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip0;



	if (flags == IRQT_PROBE)

	if (flags == IRQ_TYPE_PROBE)

		return 0;



	if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)

	if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)

		return -EINVAL;



	ip0 = sa1111_readl(mapbase + SA1111_INTPOL0);

	if (flags & __IRQT_RISEDGE)

	if (flags & IRQ_TYPE_EDGE_RISING)

		ip0 &= ~mask;

	else

		ip0 |= mask;
@@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags) 
	void __iomem *mapbase = get_irq_chip_data(irq);

	unsigned long ip1;



	if (flags == IRQT_PROBE)

	if (flags == IRQ_TYPE_PROBE)

		return 0;



	if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)

	if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)

		return -EINVAL;



	ip1 = sa1111_readl(mapbase + SA1111_INTPOL1);

	if (flags & __IRQT_RISEDGE)

	if (flags & IRQ_TYPE_EDGE_RISING)

		ip1 &= ~mask;

	else

		ip1 |= mask;
@@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip) 
	/*

	 * Register SA1111 interrupt

	 */

	set_irq_type(sachip->irq, IRQT_RISING);

	set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);

	set_irq_data(sachip->irq, irqbase);

	set_irq_chained_handler(sachip->irq, sa1111_irq_handler);

}

arch/arm/mach-at91/board-cap9adk.c

+3 −3
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ static void __init cap9adk_board_init(void) 
	/* Serial */

	at91_add_device_serial();

	/* USB Host */

	set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH);

	set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH);

	at91_add_device_usbh(&cap9adk_usbh_data);

	/* USB HS */

	set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH);

	set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH);

	at91_add_device_usba(&cap9adk_usba_udc_data);

	/* SPI */

	at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices));
@@ -350,7 +350,7 @@ static void __init cap9adk_board_init(void) 
	/* I2C */

	at91_add_device_i2c(NULL, 0);

	/* LCD Controller */

	set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH);

	set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH);

	at91_add_device_lcdc(&cap9adk_lcdc_data);

	/* AC97 */

	at91_add_device_ac97(&cap9adk_ac97_data);

arch/arm/mach-at91/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type) 
	unsigned int smr, srctype;



	switch (type) {

	case IRQT_HIGH:

	case IRQ_TYPE_LEVEL_HIGH:

		srctype = AT91_AIC_SRCTYPE_HIGH;

		break;

	case IRQT_RISING:

	case IRQ_TYPE_EDGE_RISING:

		srctype = AT91_AIC_SRCTYPE_RISING;

		break;

	case IRQT_LOW:

	case IRQ_TYPE_LEVEL_LOW:

		if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))		/* only supported on external interrupts */

			srctype = AT91_AIC_SRCTYPE_LOW;

		else

			return -EINVAL;

		break;

	case IRQT_FALLING:

	case IRQ_TYPE_EDGE_FALLING:

		if ((irq == AT91_ID_FIQ) || is_extern_irq(irq))		/* only supported on external interrupts */

			srctype = AT91_AIC_SRCTYPE_FALLING;

		else