ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 16:58:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

lantiq: Make ATM and PTM drivers compatible with kernel 4.1

Browse Source 
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

SVN-Revision: 46218
This commit is contained in:
John Crispin 2015-07-07 13:44:04 +00:00
parent 243d347a6d
commit 4c8227539e
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/kernel/lantiq/ltq-atm/src/ltq_atm.c
View File

@ -1818,7 +1818,11 @@ static int ltq_atm_probe(struct platform_device *pdev)
} }
/* register interrupt handler */ /* register interrupt handler */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, 0, "atm_mailbox_isr", &g_atm_priv_data);
#else
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "atm_mailbox_isr", &g_atm_priv_data); ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "atm_mailbox_isr", &g_atm_priv_data);
#endif
if ( ret ) { if ( ret ) {
if ( ret == -EBUSY ) { if ( ret == -EBUSY ) {
pr_err("IRQ may be occupied by other driver, please reconfig to disable it.\n"); pr_err("IRQ may be occupied by other driver, please reconfig to disable it.\n");

4
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
View File

@ -1455,7 +1455,11 @@ static int ifx_ptm_init(void)
} }
/* register interrupt handler */ /* register interrupt handler */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, 0, "ptm_mailbox_isr", &g_ptm_priv_data);
#else
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data); ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data);
#endif
if ( ret ) { if ( ret ) {
if ( ret == -EBUSY ) { if ( ret == -EBUSY ) {
err("IRQ may be occupied by other driver, please reconfig to disable it."); err("IRQ may be occupied by other driver, please reconfig to disable it.");

4
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
View File

@ -964,7 +964,11 @@ static int ifx_ptm_init(void)
} }
/* register interrupt handler */ /* register interrupt handler */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, 0, "ptm_mailbox_isr", &g_ptm_priv_data);
#else
ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data); ret = request_irq(PPE_MAILBOX_IGU1_INT, mailbox_irq_handler, IRQF_DISABLED, "ptm_mailbox_isr", &g_ptm_priv_data);
#endif
if ( ret ) { if ( ret ) {
if ( ret == -EBUSY ) { if ( ret == -EBUSY ) {
err("IRQ may be occupied by other driver, please reconfig to disable it."); err("IRQ may be occupied by other driver, please reconfig to disable it.");