diff options
| author | John Crispin <john@openwrt.org> | 2015-10-11 16:24:43 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-10-11 16:24:43 +0000 |
| commit | f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40 (patch) | |
| tree | 0b25a270ff72425410f784e6849738622c6988b4 /package/kernel/lantiq/ltq-hcd | |
| parent | c9ef7a49c7b9425556b1b88761c096741bca20aa (diff) | |
| download | upstream-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 'package/kernel/lantiq/ltq-hcd')
| -rw-r--r-- | package/kernel/lantiq/ltq-hcd/src/ifxhcd.c | 5 | ||||
| -rw-r--r-- | package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/package/kernel/lantiq/ltq-hcd/src/ifxhcd.c b/package/kernel/lantiq/ltq-hcd/src/ifxhcd.c index be0a91d262..3fb00e0324 100644 --- a/package/kernel/lantiq/ltq-hcd/src/ifxhcd.c +++ b/package/kernel/lantiq/ltq-hcd/src/ifxhcd.c @@ -701,10 +701,7 @@ int ifxhcd_init(ifxhcd_hcd_t *_ifxhcd) * allocates the DMA buffer pool, registers the USB bus, requests the * IRQ line, and calls ifxusb_hcd_start method. */ - retval = usb_add_hcd(syshcd, _ifxhcd->core_if.irq, 0 - |IRQF_DISABLED - |IRQF_SHARED - ); + retval = usb_add_hcd(syshcd, _ifxhcd->core_if.irq, 0 | IRQF_SHARED); if (retval < 0) goto error2; diff --git a/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c index e9e67bf43c..1fcdebfcd9 100644 --- a/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c +++ b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c @@ -778,7 +778,6 @@ void ifxusb_vbus_free(ifxusb_core_if_t *_core_if) // | IRQF_TRIGGER_HIGH // | IRQF_TRIGGER_LOW // | IRQF_TRIGGER_PROBE - | IRQF_DISABLED // | IRQF_SAMPLE_RANDOM // | IRQF_SHARED | IRQF_PROBE_SHARED @@ -806,7 +805,6 @@ void ifxusb_vbus_free(ifxusb_core_if_t *_core_if) // | IRQF_TRIGGER_HIGH // | IRQF_TRIGGER_LOW // | IRQF_TRIGGER_PROBE - | IRQF_DISABLED // | IRQF_SAMPLE_RANDOM // | IRQF_SHARED | IRQF_PROBE_SHARED @@ -1009,7 +1007,6 @@ void ifxusb_vbus_free(ifxusb_core_if_t *_core_if) // | IRQF_TRIGGER_HIGH // | IRQF_TRIGGER_LOW // | IRQF_TRIGGER_PROBE - | IRQF_DISABLED // | IRQF_SAMPLE_RANDOM // | IRQF_SHARED | IRQF_PROBE_SHARED @@ -1174,7 +1171,6 @@ void ifxusb_vbus_free(ifxusb_core_if_t *_core_if) // | IRQF_TRIGGER_HIGH // | IRQF_TRIGGER_LOW // | IRQF_TRIGGER_PROBE - | IRQF_DISABLED // | IRQF_SAMPLE_RANDOM // | IRQF_SHARED // | IRQF_PROBE_SHARED |