From 084be4538d52aaf2269e90cead2d16d15213f7b7 Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Mon, 20 Feb 2006 14:49:12 -0800 Subject: [PATCH] ARM: OMAP: Update usage of SA_SAMPLE_RANDOM flag MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As proposed by Juha Yrjölä. Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- drivers/i2c/chips/isp1301_omap.c | 2 +- drivers/i2c/chips/tps65010.c | 2 +- drivers/input/touchscreen/omap/omap_ts.c | 3 ++- drivers/input/touchscreen/omap/ts_inn1510.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 14c63ae9f5d..8e5f37c6bb6 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c @@ -1527,7 +1527,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind) isp->timer.data = (unsigned long) isp; isp->irq = -1; - isp->irq_type = SA_SAMPLE_RANDOM; + isp->irq_type = 0; isp->client.addr = address; i2c_set_clientdata(&isp->client, isp); isp->client.adapter = bus; diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index 6a3d71494c4..ba4a0acf279 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c @@ -527,7 +527,7 @@ fail1: return 0; } - tps->irq_type = SA_SAMPLE_RANDOM; + tps->irq_type = 0; #ifdef CONFIG_ARM if (machine_is_omap_h2()) { diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c index 389d1090794..d5b6fb3d4d2 100644 --- a/drivers/input/touchscreen/omap/omap_ts.c +++ b/drivers/input/touchscreen/omap/omap_ts.c @@ -162,7 +162,8 @@ static int __init omap_ts_probe(struct platform_device *pdev) /* request irq */ if (ts_omap.irq != -1) { - if (request_irq(ts_omap.irq, omap_ts_handler, ts_omap.irq_type, + if (request_irq(ts_omap.irq, omap_ts_handler, + SA_SAMPLE_RANDOM | ts_omap.irq_type, OMAP_TS_NAME, &ts_omap)) { printk(KERN_ERR "omap_ts.c: Could not allocate touchscreen IRQ!\n"); diff --git a/drivers/input/touchscreen/omap/ts_inn1510.c b/drivers/input/touchscreen/omap/ts_inn1510.c index 5147ac64560..c181e1dc5d5 100644 --- a/drivers/input/touchscreen/omap/ts_inn1510.c +++ b/drivers/input/touchscreen/omap/ts_inn1510.c @@ -176,7 +176,7 @@ static int __init inn1510_ts_probe(struct omap_ts_t *ts) return -ENODEV; ts->irq = OMAP1510_INT_FPGA_TS; - ts->irq_type = SA_SAMPLE_RANDOM; + ts->irq_type = 0; return 0; } -- 2.41.3