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

Commit 6ceab8a9 authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds
Browse files

[PATCH] random: remove redundant SA_SAMPLE_RANDOM from touchscreen drivers 



The core input layer is already calling add_input_randomness.

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0f41a53a

drivers/input/touchscreen/ads7846.c

+1 −2
Original line number Diff line number Diff line
@@ -773,8 +773,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) 


	ts->last_msg = m;



	if (request_irq(spi->irq, ads7846_irq,

			SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,

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

			spi->dev.driver->name, ts)) {

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

		err = -EBUSY;

drivers/input/touchscreen/h3600_ts_input.c

+2 −4
Original line number Diff line number Diff line
@@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) 
	set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);



	if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,

			SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,

			"h3600_action", &ts->dev)) {

			SA_SHIRQ | SA_INTERRUPT, "h3600_action", &ts->dev)) {

		printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");

		err = -EBUSY;

		goto fail2;

	}



	if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,

			SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,

			"h3600_suspend", &ts->dev)) {

			SA_SHIRQ | SA_INTERRUPT, "h3600_suspend", &ts->dev)) {

		printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");

		err = -EBUSY;

		goto fail3;