Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751669AbWEEQqP (ORCPT ); Fri, 5 May 2006 12:46:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751647AbWEEQoy (ORCPT ); Fri, 5 May 2006 12:44:54 -0400 Received: from CPE-70-92-180-7.mn.res.rr.com ([70.92.180.7]:34436 "EHLO cinder.waste.org") by vger.kernel.org with ESMTP id S1751650AbWEEQov (ORCPT ); Fri, 5 May 2006 12:44:51 -0400 From: Matt Mackall To: Andrew Morton X-PatchBomber: http://selenic.com/scripts/mailpatches Cc: linux-kernel@vger.kernel.org, dtor_core@ameritech.net In-Reply-To: <2.420169009@selenic.com> Message-Id: <7.420169009@selenic.com> Subject: [PATCH 6/14] random: Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers Date: Fri, 05 May 2006 11:42:34 -0500 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2090 Lines: 48 Remove redundant SA_SAMPLE_RANDOM from touchscreen drivers The core input layer is already calling add_input_randomness. Signed-off-by: Matt Mackall Index: 2.6/drivers/input/touchscreen/ads7846.c =================================================================== --- 2.6.orig/drivers/input/touchscreen/ads7846.c 2006-05-02 17:29:26.000000000 -0500 +++ 2.6/drivers/input/touchscreen/ads7846.c 2006-05-03 11:58:51.000000000 -0500 @@ -770,8 +770,7 @@ static int __devinit ads7846_probe(struc 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.bus_id, ts)) { dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); err = -EBUSY; Index: 2.6/drivers/input/touchscreen/h3600_ts_input.c =================================================================== --- 2.6.orig/drivers/input/touchscreen/h3600_ts_input.c 2006-04-20 17:00:40.000000000 -0500 +++ 2.6/drivers/input/touchscreen/h3600_ts_input.c 2006-05-03 11:58:13.000000000 -0500 @@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio 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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/