Author: blogic Date: 2015-07-07 15:44:04 +0200 (Tue, 07 Jul 2015) New Revision: 46218
Modified: trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c Log: lantiq: Make ATM and PTM drivers compatible with kernel 4.1 Signed-off-by: Martin Blumenstingl <[email protected]> Modified: trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c =================================================================== --- trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c 2015-07-07 13:43:54 UTC (rev 46217) +++ trunk/package/kernel/lantiq/ltq-atm/src/ltq_atm.c 2015-07-07 13:44:04 UTC (rev 46218) @@ -1818,7 +1818,11 @@ } /* 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); +#endif if ( ret ) { if ( ret == -EBUSY ) { pr_err("IRQ may be occupied by other driver, please reconfig to disable it.\n"); Modified: trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c =================================================================== --- trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c 2015-07-07 13:43:54 UTC (rev 46217) +++ trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c 2015-07-07 13:44:04 UTC (rev 46218) @@ -1455,7 +1455,11 @@ } /* 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); +#endif if ( ret ) { if ( ret == -EBUSY ) { err("IRQ may be occupied by other driver, please reconfig to disable it."); Modified: trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c =================================================================== --- trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c 2015-07-07 13:43:54 UTC (rev 46217) +++ trunk/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c 2015-07-07 13:44:04 UTC (rev 46218) @@ -964,7 +964,11 @@ } /* 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); +#endif if ( ret ) { if ( ret == -EBUSY ) { err("IRQ may be occupied by other driver, please reconfig to disable it."); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
