From 62bcd38cc3d3c6f344a165f9169d1eb28d07f863 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 26 Sep 2012 12:53:58 +0000 Subject: [PATCH] [targets] get rid of the IRQF_SAMPLE_RANDOM flag git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33558 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/broadcom-diag/src/diag.c | 2 +- target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch | 2 +- .../brcm2708/patches-3.3/0005-bcm2708-vchiq-driver.patch | 2 +- .../patches-3.3/315-n800-touchscreen-and-keypad-drivers.patch | 4 ++-- .../files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c index cf6d789c2..7e0ff02e1 100644 --- a/package/broadcom-diag/src/diag.c +++ b/package/broadcom-diag/src/diag.c @@ -1297,7 +1297,7 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *)) if (irq == -EINVAL) return; if (enabled) { - if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler)) + if (request_irq(irq, handler, IRQF_SHARED, "gpio", handler)) return; } else { free_irq(irq, handler); diff --git a/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch index 47c9dd622..838ea8936 100644 --- a/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch @@ -744,7 +744,7 @@ + */ + ecode = + request_irq(dev->irq, &ar231x_interrupt, -+ IRQF_DISABLED | IRQF_SAMPLE_RANDOM, ++ IRQF_DISABLED, + dev->name, dev); + if (ecode) { + printk(KERN_WARNING "%s: %s: Requested IRQ %d is busy\n", diff --git a/target/linux/brcm2708/patches-3.3/0005-bcm2708-vchiq-driver.patch b/target/linux/brcm2708/patches-3.3/0005-bcm2708-vchiq-driver.patch index bee41d712..47c6d8e87 100644 --- a/target/linux/brcm2708/patches-3.3/0005-bcm2708-vchiq-driver.patch +++ b/target/linux/brcm2708/patches-3.3/0005-bcm2708-vchiq-driver.patch @@ -414,7 +414,7 @@ Signed-off-by: popcornmix + } + + err = request_irq(VCHIQ_DOORBELL_IRQ, vchiq_doorbell_irq, -+ IRQF_SAMPLE_RANDOM | IRQF_IRQPOLL, "VCHIQ doorbell", ++ IRQF_IRQPOLL, "VCHIQ doorbell", + state); + if (err < 0) + { diff --git a/target/linux/omap24xx/patches-3.3/315-n800-touchscreen-and-keypad-drivers.patch b/target/linux/omap24xx/patches-3.3/315-n800-touchscreen-and-keypad-drivers.patch index 799c1de09..106a5d80c 100644 --- a/target/linux/omap24xx/patches-3.3/315-n800-touchscreen-and-keypad-drivers.patch +++ b/target/linux/omap24xx/patches-3.3/315-n800-touchscreen-and-keypad-drivers.patch @@ -485,7 +485,7 @@ Touchscreen and keypad are fully functional, audio part only provides power mana + + irq_set_irq_type(kp->irq, IRQ_TYPE_EDGE_FALLING); + -+ r = request_irq(kp->irq, tsc2301_kp_irq_handler, IRQF_SAMPLE_RANDOM, ++ r = request_irq(kp->irq, tsc2301_kp_irq_handler, 0, + "tsc2301-kp", tsc); + if (r < 0) { + dev_err(&tsc->spi->dev, "unable to get kbirq IRQ"); @@ -1179,7 +1179,7 @@ Touchscreen and keypad are fully functional, audio part only provides power mana + tsc2301_ts_start_scan(tsc); + + r = request_irq(ts->irq, tsc2301_ts_irq_handler, -+ IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING, ++ IRQF_TRIGGER_FALLING, + "tsc2301-ts", tsc); + if (r < 0) { + dev_err(&tsc->spi->dev, "unable to get DAV IRQ"); diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c index f980bfcce..93163ff50 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/input/touchscreen/s3c2410_ts.c @@ -424,14 +424,14 @@ static int __init s3c2410ts_probe(struct platform_device *pdev) ts_filter_chain_clear(ts.chain); /* Get irqs */ - if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM, + if (request_irq(IRQ_ADC, stylus_action, 0, "s3c2410_action", ts.dev)) { dev_err(&pdev->dev, "Could not allocate ts IRQ_ADC !\n"); iounmap(base_addr); ret = -EIO; goto bail3; } - if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM, + if (request_irq(IRQ_TC, stylus_updown, 0, "s3c2410_action", ts.dev)) { dev_err(&pdev->dev, "Could not allocate ts IRQ_TC !\n"); free_irq(IRQ_ADC, ts.dev);