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

Commit f43aaba1 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Convert request_irq+set_irq_type to request_irq with SA_TRIGGER 



There's no need to have request_irq followed by set_irq_type.
Just use request_irq with the appropriate SA_TRIGGER flags.

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

drivers/input/touchscreen/ads7846.c

+3 −6
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
#ifdef	CONFIG_ARCH_OMAP

#include <asm/arch/gpio.h>

#endif



#else

#define	set_irq_type(irq,type)	do{}while(0)

#endif
@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi) 
	ts->msg.complete = ads7846_rx;

	ts->msg.context = ts;



	if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM,

	if (request_irq(spi->irq, ads7846_irq,

			SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,

			spi->dev.bus_id, ts)) {

		dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);

		input_unregister_device(&ts->input);

		kfree(ts);

		return -EBUSY;

	}

	set_irq_type(spi->irq, IRQT_FALLING);



	dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);

drivers/serial/imx.c

+2 −2
Original line number Diff line number Diff line
@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port) 
			     DRIVER_NAME, sport);

	if (retval) goto error_out2;



	retval = request_irq(sport->rtsirq, imx_rtsint, 0,

	retval = request_irq(sport->rtsirq, imx_rtsint,

			     SA_TRIGGER_FALLING | SA_TRIGGER_RISING,

			     DRIVER_NAME, sport);

	if (retval) goto error_out3;

	set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);



	/*

	 * Finally, clear and enable interrupts