Commit dfa10679 authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] pxa: cleanup the coding style of pxa_gpio_set_type() 



by

1. wrapping long lines and making comments tidy

2. using IRQ_TYPE_* instead of migration macros __IRQT_*

3. introduce a pr_debug() for the commented printk(KERN_DEBUG ...)
   stuff

Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a7bf4dba

arch/arm/mach-pxa/irq.c

+20 −22
Original line number Diff line number Diff line
@@ -121,39 +121,37 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) 
	gpio = IRQ_TO_GPIO(irq);

	idx = gpio >> 5;



	if (type == IRQT_PROBE) {

	if (type == IRQ_TYPE_PROBE) {

		/* Don't mess with enabled GPIOs using preconfigured edges or

	       GPIOs set to alternate function or to output during probe */

		if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx] | GPDR(gpio)) &

		    GPIO_bit(gpio))

		 * GPIOs set to alternate function or to output during probe

		 */

		if ((GPIO_IRQ_rising_edge[idx] |

		     GPIO_IRQ_falling_edge[idx] |

		     GPDR(gpio)) & GPIO_bit(gpio))

			return 0;

		if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))

			return 0;

		type = __IRQT_RISEDGE | __IRQT_FALEDGE;

		type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;

	}



	/* printk(KERN_DEBUG "IRQ%d (GPIO%d): ", irq, gpio); */



	pxa_gpio_mode(gpio | GPIO_IN);



	if (type & __IRQT_RISEDGE) {

		/* printk("rising "); */

	if (type & IRQ_TYPE_EDGE_RISING)

		__set_bit(gpio, GPIO_IRQ_rising_edge);

	} else {

	else

		__clear_bit(gpio, GPIO_IRQ_rising_edge);

	}



	if (type & __IRQT_FALEDGE) {

		/* printk("falling "); */

	if (type & IRQ_TYPE_EDGE_FALLING)

		__set_bit(gpio, GPIO_IRQ_falling_edge);

	} else {

	else

		__clear_bit(gpio, GPIO_IRQ_falling_edge);

	}



	/* printk("edges\n"); */



	GRER(gpio) = GPIO_IRQ_rising_edge[idx] & GPIO_IRQ_mask[idx];

	GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx];



	pr_debug("%s: IRQ%d (GPIO%d) - edge%s%s\n", __func__, irq, gpio,

		((type & IRQ_TYPE_EDGE_RISING)  ? " rising"  : ""),

		((type & IRQ_TYPE_EDGE_FALLING) ? " falling" : ""));

	return 0;

}