lantiq: Make ATM and PTM drivers compatible with kernel 4.1
authorJohn Crispin <john@openwrt.org>
Tue, 7 Jul 2015 13:44:04 +0000 (13:44 +0000)
committerJohn Crispin <john@openwrt.org>
Tue, 7 Jul 2015 13:44:04 +0000 (13:44 +0000)
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 46218

package/kernel/lantiq/ltq-atm/src/ltq_atm.c
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c

index 15435f6bfb225e761d97cf08d22819cd1f0452d3..84ce7fa2eb4cd643dbc965d8fb23ff9e61ba9518 100644 (file)
@@ -1818,7 +1818,11 @@ static int ltq_atm_probe(struct platform_device *pdev)
        }
 
        /*  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");
index 82ac2ad1c0552ea7d12e64aaea8d2ed33c134f79..38001c3171f95371234db3fa5a373ab34513864f 100644 (file)
@@ -1455,7 +1455,11 @@ static int ifx_ptm_init(void)
     }
 
     /*  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.");
index b328261c5f9c5222692c2135e4d7125542696647..9adeba4d00c7c50b946d5d3e209dba9bba699633 100644 (file)
@@ -964,7 +964,11 @@ static int ifx_ptm_init(void)
     }
 
     /*  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.");