]> err.no Git - linux-2.6/commitdiff
[PATCH] random: remove redundant SA_SAMPLE_RANDOM from touchscreen drivers
authorMatt Mackall <mpm@selenic.com>
Sun, 25 Jun 2006 12:47:13 +0000 (05:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 25 Jun 2006 17:01:00 +0000 (10:01 -0700)
The core input layer is already calling add_input_randomness.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/h3600_ts_input.c

index 161afddd0f44396da88402f0af5bb2b9445f1a74..386023c594d74d758bbc592302d2383f84eef80b 100644 (file)
@@ -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;
index a18d56bdafd931526b7184e846aab71f58a75aac..a595d386312fee511e8adc1d3daabf017080dd31 100644 (file)
@@ -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;