aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.1
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-10-11 16:24:43 +0000
committerJohn Crispin <john@openwrt.org>2015-10-11 16:24:43 +0000
commitf457ae99f20bed2f8482ca9f9f1e4e7ac2701d40 (patch)
tree0b25a270ff72425410f784e6849738622c6988b4 /target/linux/lantiq/patches-4.1
parentc9ef7a49c7b9425556b1b88761c096741bca20aa (diff)
downloadupstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.tar.gz
upstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.tar.bz2
upstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.zip
lantiq: fix use of IRQF_DISABLED in lantiq kmods
The IRQF_DISABLED flag was removed in kernel 4.1 with commit "genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely" [1]. Therefore the compilation of ltq-hcd and ltq-vmmc kmods fails. [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc Signed-off-by: Mathias Kresin <openwrt@kresin.me> SVN-Revision: 47180
Diffstat (limited to 'target/linux/lantiq/patches-4.1')
-rw-r--r--target/linux/lantiq/patches-4.1/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-4.1/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch b/target/linux/lantiq/patches-4.1/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
index 164c9476a4..0fe9f04975 100644
--- a/target/linux/lantiq/patches-4.1/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
+++ b/target/linux/lantiq/patches-4.1/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
@@ -668,7 +668,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ priv->irq_lb = irqres[0].start;
+
+ ret = devm_request_irq(&pdev->dev, irqres[0].start, ltq_i2c_isr_burst,
-+ IRQF_DISABLED, "i2c lb", priv);
++ 0x0, "i2c lb", priv);
+ if (ret) {
+ dev_err(&pdev->dev, "can't get last burst IRQ %d\n",
+ irqres[0].start);
@@ -676,7 +676,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ }
+
+ ret = devm_request_irq(&pdev->dev, irqres[1].start, ltq_i2c_isr_burst,
-+ IRQF_DISABLED, "i2c b", priv);
++ 0x0, "i2c b", priv);
+ if (ret) {
+ dev_err(&pdev->dev, "can't get burst IRQ %d\n",
+ irqres[1].start);
@@ -684,7 +684,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ }
+
+ ret = devm_request_irq(&pdev->dev, irqres[2].start, ltq_i2c_isr,
-+ IRQF_DISABLED, "i2c err", priv);
++ 0x0, "i2c err", priv);
+ if (ret) {
+ dev_err(&pdev->dev, "can't get error IRQ %d\n",
+ irqres[2].start);
@@ -692,7 +692,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ }
+
+ ret = devm_request_irq(&pdev->dev, irqres[3].start, ltq_i2c_isr,
-+ IRQF_DISABLED, "i2c p", priv);
++ 0x0, "i2c p", priv);
+ if (ret) {
+ dev_err(&pdev->dev, "can't get protocol IRQ %d\n",
+ irqres[3].start);