kernel: drop outdated kernel version switches for local code

This drops kernel version switches for versions not supported by
OpenWrt master at the moment. This only adjusts local code, but
doesn't touch patches to existing external packages.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c b/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
index 8da7580562c5b6634e680db847963a6a00f5602c..8f180edd33f8824f88d71f8c92a552a8c20fbe16 100644 (file)
--- a/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
+++ b/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
@@ -276,11 +276,7 @@ static int nct5104d_gpio_probe(struct platform_device *pdev)
        for (i = 0; i < data->nr_bank; i++) {
                struct nct5104d_gpio_bank *bank = &data->bank[i];
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
-               bank->chip.dev = &pdev->dev;
-#else
                bank->chip.parent = &pdev->dev;
-#endif
                bank->data = data;
 
                err = gpiochip_add(&bank->chip);
@@ -298,15 +294,7 @@ err_gpiochip:
        for (i = i - 1; i >= 0; i--) {
                struct nct5104d_gpio_bank *bank = &data->bank[i];
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
-               int rm_err = gpiochip_remove(&bank->chip);
-               if (rm_err < 0)
-                       dev_err(&pdev->dev,
-                               "Failed to remove gpiochip %d: %d\n",
-                               i, rm_err);
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
                gpiochip_remove (&bank->chip);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
        }
 
        return err;
@@ -320,17 +308,7 @@ static int nct5104d_gpio_remove(struct platform_device *pdev)
        for (i = 0; i < data->nr_bank; i++) {
                struct nct5104d_gpio_bank *bank = &data->bank[i];
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
-               int err = gpiochip_remove(&bank->chip);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Failed to remove GPIO gpiochip %d: %d\n",
-                               i, err);
-                       return err;
-               }
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
                gpiochip_remove (&bank->chip);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
        }
 
        return 0;

diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h b/package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
index dc9f1c241bcede72b907e9ac341aa56af28a18a3..e5089c43a3313dae434d7cd69c2555d85faf5bdc 100644 (file)
--- a/package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
+++ b/package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
@@ -111,11 +111,7 @@ static inline long
 ugly_hack_sleep_on_timeout(wait_queue_head_t *q, long timeout)
 {
        unsigned long flags;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
        wait_queue_entry_t wait;
-#else
-       wait_queue_t wait;
-#endif
 
        init_waitqueue_entry(&wait, current);
 
@@ -523,9 +519,7 @@ typedef struct DSL_DEV_Device
 #define IFX_DFEIR              0
 #define IFX_DYING_GASP 1
        DSL_DEV_MeiDebug_t lop_debugwr;  /* dying gasp */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0))
        struct module *owner;
-#endif
 } DSL_DEV_Device_t;                    /* ifx_adsl_device_t */
 
 #define DSL_DEV_PRIVATE(dev)  ((ifx_mei_device_private_t*)(dev->pPriv))

diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
index 8638b12b4e585e5e862aaf283d9ae8f5fa94c6fd..85f27156b5e117c77efaa15527936c99439d70de 100644 (file)
--- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
+++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
@@ -60,7 +60,6 @@
 
 static inline void vr9_reset_ppe(struct platform_device *pdev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
        struct device *dev = &pdev->dev;
        struct reset_control *dsp;
        struct reset_control *dfe;
@@ -97,7 +96,6 @@ static inline void vr9_reset_ppe(struct platform_device *pdev)
        udelay(1000);
        *PP32_SRST |= 0x000303CF;
        udelay(1000);
-#endif
 }
 
 static inline int vr9_pp32_download_code(int pp32, u32 *code_src, unsigned int code_dword_len, u32 *data_src, unsigned int data_dword_len)

diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
index 267a515df6c0ccaaa4ac9c9797399c89e4003fea..f5dbfaae2dbe821493c1eb2fd613d5ebacf33a99 100644 (file)
--- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
+++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
@@ -1809,11 +1809,7 @@ 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");

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
index 6c8d065d8b498994afe3d4931a17fc54a82b32fe..76abfafb4e69bf0118f6602745b326308139f800 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
@@ -895,18 +895,6 @@ int ifxdeu_init_aes (void)
     int ret = -ENOSYS;
 
 
- 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-    if (!disable_multiblock) {
-        ifxdeu_aes_alg.cra_u.cipher.cia_max_nbytes = AES_BLOCK_SIZE;    //(size_t)-1;
-        ifxdeu_aes_alg.cra_u.cipher.cia_req_align = 16;
-        ifxdeu_aes_alg.cra_u.cipher.cia_ecb = ifx_deu_aes_ecb;
-        ifxdeu_aes_alg.cra_u.cipher.cia_cbc = ifx_deu_aes_cbc;
-        ifxdeu_aes_alg.cra_u.cipher.cia_cfb = ifx_deu_aes_cfb;
-        ifxdeu_aes_alg.cra_u.cipher.cia_ofb = ifx_deu_aes_ofb;
-    }
-#endif
-
     if ((ret = crypto_register_alg(&ifxdeu_aes_alg)))
         goto aes_err;
 

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
index 15e1485912f31952b0c1866bdcd35c8658b9c16f..dcd059371fade6095e93a306c06843d6ece1cd9f 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
@@ -100,11 +100,7 @@ extern char debug_level;
 
 
 static int disable_multiblock = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 module_param(disable_multiblock, int, 0);
-#else
-MODULE_PARM_DESC(disable_multiblock, "Disable encryption of whole multiblock buffers");
-#endif
 
 static int disable_deudma = 1;
 

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
index ea94c6460f60f0a9c8b80dd9fa94ae9c1a2e3d97..1523763ccd70710b74eec0f0bf2f21af990d1d2c 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
@@ -117,11 +117,7 @@ struct des_ctx {
 
 
 static int disable_multiblock = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 module_param(disable_multiblock, int, 0);
-#else
-MODULE_PARM_DESC(disable_multiblock, "Disable encryption of whole multiblock buffers");
-#endif
 
 static int disable_deudma = 1;
 
@@ -893,16 +889,6 @@ int __init lqdeu_async_des_init (void)
 {
     int i, j, ret = -EINVAL;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-     if (!disable_multiblock) {
-                ifxdeu_des_alg.cra_u.cipher.cia_max_nbytes = DES_BLOCK_SIZE;    //(size_t)-1;
-                ifxdeu_des_alg.cra_u.cipher.cia_req_align = 16;
-                ifxdeu_des_alg.cra_u.cipher.cia_ecb = ifx_deu_des_ecb;
-                ifxdeu_des_alg.cra_u.cipher.cia_cbc = ifx_deu_des_cbc;
-                ifxdeu_des_alg.cra_u.cipher.cia_cfb = ifx_deu_des_cfb;
-                ifxdeu_des_alg.cra_u.cipher.cia_ofb = ifx_deu_des_ofb;
-        }
-#endif
      for (i = 0; i < ARRAY_SIZE(des_drivers_alg); i++) {
          ret = crypto_register_alg(&des_drivers_alg[i].alg);
         //printk("driver: %s\n", des_drivers_alg[i].alg.cra_name);

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
index beb67075ee43842a3352833adfcb2f04241271c1..6d7d82fcb92fc181a164ff37615fb24eb6c752a6 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
@@ -691,17 +691,6 @@ int ifxdeu_init_des (void)
     int ret = -ENOSYS;
 
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-     if (!disable_multiblock) {
-                ifxdeu_des_alg.cra_u.cipher.cia_max_nbytes = DES_BLOCK_SIZE;    //(size_t)-1;
-                ifxdeu_des_alg.cra_u.cipher.cia_req_align = 16;
-                ifxdeu_des_alg.cra_u.cipher.cia_ecb = ifx_deu_des_ecb;
-                ifxdeu_des_alg.cra_u.cipher.cia_cbc = ifx_deu_des_cbc;
-                ifxdeu_des_alg.cra_u.cipher.cia_cfb = ifx_deu_des_cfb;
-                ifxdeu_des_alg.cra_u.cipher.cia_ofb = ifx_deu_des_ofb;
-        }
-#endif
-
         ret = crypto_register_alg(&ifxdeu_des_alg);
         if (ret < 0)
                 goto des_err;

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
index 05f168160b15949e323ae849edc043dfa169994a..3947b31a40b9fbff99ce64b4ca66507dfd815b35 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
@@ -171,14 +171,8 @@ static int ltq_deu_remove(struct platform_device *pdev)
 
 int disable_multiblock = 0;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 module_param(disable_multiblock,int,0);
 
-#else
-//MODULE_PARM (disable_multiblock, "i");
-MODULE_PARM_DESC (disable_multiblock,
-          "Disable encryption of whole multiblock buffers.");
-#endif
 
 static const struct of_device_id ltq_deu_match[] = {
 #ifdef CONFIG_DANUBE

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
index b64d74776bb4f602d17e4848285e99500a8a797b..7a1b85f1d145acdadbc672137809ffe3be37139d 100644 (file)
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
@@ -54,11 +54,7 @@ typedef struct ifx_deu_device {
        int recv_count;
        int packet_size;
        int packet_num;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
        wait_queue_entry_t wait;
-#else
-       wait_queue_t wait;
-#endif
 } _ifx_deu_device;
 
 extern _ifx_deu_device ifx_deu[1];

diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
index 186c848693f975edbf68e2762eb2e3df08b62618..18c715a29012ec3d0734543b45da85b9444b157b 100644 (file)
--- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
+++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
@@ -61,12 +61,8 @@
  *        Kernel Version Adaption
  * ####################################
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
   #define MODULE_PARM_ARRAY(a, b)   module_param_array(a, int, NULL, 0)
   #define MODULE_PARM(a, b)         module_param(a, int, 0)
-#else
-  #define MODULE_PARM_ARRAY(a, b)   MODULE_PARM(a, b)
-#endif
 
 
 
@@ -130,9 +126,6 @@ static int ptm_stop(struct net_device *);
   static unsigned int ptm_poll(int, unsigned int);
   static int ptm_napi_poll(struct napi_struct *, int);
 static int ptm_hard_start_xmit(struct sk_buff *, struct net_device *);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-static int ptm_change_mtu(struct net_device *, int);
-#endif
 static int ptm_ioctl(struct net_device *, struct ifreq *, int);
 static void ptm_tx_timeout(struct net_device *);
 
@@ -243,7 +236,6 @@ static INLINE void init_tables(void);
 
 static struct ptm_priv_data g_ptm_priv_data;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
 static struct net_device_ops g_ptm_netdev_ops = {
     .ndo_get_stats       = ptm_get_stats,
     .ndo_open            = ptm_open,
@@ -251,13 +243,9 @@ static struct net_device_ops g_ptm_netdev_ops = {
     .ndo_start_xmit      = ptm_hard_start_xmit,
     .ndo_validate_addr   = eth_validate_addr,
     .ndo_set_mac_address = eth_mac_addr,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-    .ndo_change_mtu      = ptm_change_mtu,
-#endif
     .ndo_do_ioctl        = ptm_ioctl,
     .ndo_tx_timeout      = ptm_tx_timeout,
 };
-#endif
 
 static struct net_device *g_net_dev[2] = {0};
 static char *g_net_dev_name[2] = {"dsl0", "dslfast0"};
@@ -291,10 +279,8 @@ static void ptm_setup(struct net_device *dev, int ndev)
 
     /*  hook network operations */
     dev->netdev_ops      = &g_ptm_netdev_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
     /* Allow up to 1508 bytes, for RFC4638 */
     dev->max_mtu         = ETH_DATA_LEN + 8;
-#endif
     netif_napi_add(dev, &g_ptm_priv_data.itf[ndev].napi, ptm_napi_poll, 25);
     dev->watchdog_timeo  = ETH_WATCHDOG_TIMEOUT;
 
@@ -415,11 +401,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /*  allocate descriptor */
     desc_base = get_tx_desc(ndev, &f_full);
     if ( f_full ) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
         netif_trans_update(dev);
-#else
-        dev->trans_start = jiffies;
-#endif
         netif_stop_queue(dev);
 
         IFX_REG_W32_MASK(0, 1 << (ndev + 16), MBOX_IGU1_ISRC);
@@ -453,11 +435,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
     g_ptm_priv_data.itf[ndev].stats.tx_packets++;
     g_ptm_priv_data.itf[ndev].stats.tx_bytes += reg_desc.datalen;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
     netif_trans_update(dev);
-#else
-    dev->trans_start = jiffies;
-#endif
     mailbox_signal(ndev, 1);
 
     adsl_led_flash();
@@ -469,16 +447,6 @@ PTM_HARD_START_XMIT_FAIL:
     g_ptm_priv_data.itf[ndev].stats.tx_dropped++;
     return NETDEV_TX_OK;
 }
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-static int ptm_change_mtu(struct net_device *dev, int mtu)
-{
-       /* Allow up to 1508 bytes, for RFC4638 */
-        if (mtu < 68 || mtu > ETH_DATA_LEN + 8)
-                return -EINVAL;
-        dev->mtu = mtu;
-        return 0;
-}
-#endif
 
 static int ptm_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
@@ -665,10 +633,6 @@ static INLINE int mailbox_rx_irq_handler(unsigned int ch)   //  return: < 0 - de
             skb->dev = g_net_dev[ndev];
             skb->protocol = eth_type_trans(skb, skb->dev);
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0))
-            g_net_dev[ndev]->last_rx = jiffies;
-#endif
-
             netif_rx_ret = netif_receive_skb(skb);
 
             if ( netif_rx_ret != NET_RX_DROP ) {
@@ -1513,11 +1477,7 @@ static int ltq_ptm_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, "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.");

diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
index 46a52e29d8359235f3b89f0c6271d506a6569c5c..f77f47565671b7d1b292d4afca101ef51bfe6b42 100644 (file)
--- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
+++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
@@ -76,9 +76,6 @@ static int ptm_stop(struct net_device *);
   static unsigned int ptm_poll(int, unsigned int);
   static int ptm_napi_poll(struct napi_struct *, int);
 static int ptm_hard_start_xmit(struct sk_buff *, struct net_device *);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-static int ptm_change_mtu(struct net_device *, int);
-#endif
 static int ptm_ioctl(struct net_device *, struct ifreq *, int);
 static void ptm_tx_timeout(struct net_device *);
 
@@ -119,9 +116,6 @@ static struct net_device_ops g_ptm_netdev_ops = {
     .ndo_start_xmit      = ptm_hard_start_xmit,
     .ndo_validate_addr   = eth_validate_addr,
     .ndo_set_mac_address = eth_mac_addr,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-    .ndo_change_mtu      = ptm_change_mtu,
-#endif
     .ndo_do_ioctl        = ptm_ioctl,
     .ndo_tx_timeout      = ptm_tx_timeout,
 };
@@ -147,10 +141,8 @@ static void ptm_setup(struct net_device *dev, int ndev)
     netif_carrier_off(dev);
 
     dev->netdev_ops      = &g_ptm_netdev_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
     /* Allow up to 1508 bytes, for RFC4638 */
     dev->max_mtu         = ETH_DATA_LEN + 8;
-#endif
     netif_napi_add(dev, &g_ptm_priv_data.itf[ndev].napi, ptm_napi_poll, 16);
     dev->watchdog_timeo  = ETH_WATCHDOG_TIMEOUT;
 
@@ -228,10 +220,6 @@ static unsigned int ptm_poll(int ndev, unsigned int work_to_do)
             skb->dev = g_net_dev[0];
             skb->protocol = eth_type_trans(skb, skb->dev);
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0))
-            g_net_dev[0]->last_rx = jiffies;
-#endif
-
             netif_receive_skb(skb);
 
             g_ptm_priv_data.itf[0].stats.rx_packets++;
@@ -301,11 +289,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /*  allocate descriptor */
     desc_base = get_tx_desc(0, &f_full);
     if ( f_full ) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
         netif_trans_update(dev);
-#else
-        dev->trans_start = jiffies;
-#endif
         netif_stop_queue(dev);
 
         IFX_REG_W32_MASK(0, 1 << 17, MBOX_IGU1_ISRC);
@@ -367,11 +351,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
     wmb();
     *(volatile unsigned int *)desc = *(unsigned int *)&reg_desc;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
     netif_trans_update(dev);
-#else
-    dev->trans_start = jiffies;
-#endif
 
     return 0;
 
@@ -382,17 +362,6 @@ PTM_HARD_START_XMIT_FAIL:
     return 0;
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
-static int ptm_change_mtu(struct net_device *dev, int mtu)
-{
-       /* Allow up to 1508 bytes, for RFC4638 */
-        if (mtu < 68 || mtu > ETH_DATA_LEN + 8)
-                return -EINVAL;
-        dev->mtu = mtu;
-        return 0;
-}
-#endif
-
 static int ptm_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
     ASSERT(dev == g_net_dev[0], "incorrect device");
@@ -1024,11 +993,7 @@ static int ltq_ptm_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, "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.");

diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
index cf0897b5630d370342645d5e48bfdaf145fa49db..bf93437fb0ee4986dfa71f3cdf46765e213ae2d1 100644 (file)
--- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
+++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
@@ -84,7 +84,6 @@ static inline void uninit_pmu(void)
 
 static inline void reset_ppe(struct platform_device *pdev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
        struct device *dev = &pdev->dev;
        struct reset_control *dsp;
        struct reset_control *dfe;
@@ -121,7 +120,6 @@ static inline void reset_ppe(struct platform_device *pdev)
        udelay(1000);
        *PP32_SRST |= 0x000303CF;
        udelay(1000);
-#endif
 }
 
 static inline void init_pdma(void)

diff --git a/package/kernel/leds-apu2/src/leds-apu2.c b/package/kernel/leds-apu2/src/leds-apu2.c
index ff13b3cde10a109fe576c88be022020324ca734a..ef125c876899d1d7df3a2cf35f074742df4434cf 100644 (file)
--- a/package/kernel/leds-apu2/src/leds-apu2.c
+++ b/package/kernel/leds-apu2/src/leds-apu2.c
@@ -194,11 +194,7 @@ static int gpio_apu2_probe (struct platform_device *dev)
                }
        }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
-       gpio_apu2_chip.dev = &dev->dev;
-#else
        gpio_apu2_chip.parent = &dev->dev;
-#endif
        ret = gpiochip_add (&gpio_apu2_chip);
        if (ret) {
                pr_err ("%s: adding gpiochip failed\n", DEVNAME);
@@ -209,12 +205,7 @@ static int gpio_apu2_probe (struct platform_device *dev)
 
 static int gpio_apu2_remove (struct platform_device *dev)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
-       int ret;
-       ret = gpiochip_remove (&gpio_apu2_chip);
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
        gpiochip_remove (&gpio_apu2_chip);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */
        return 0;
 }
 

diff --git a/package/kernel/rtc-rv5c386a/src/rtc.c b/package/kernel/rtc-rv5c386a/src/rtc.c
index 96dc56eb36f500dc308584e1b52eee2e3860e229..0c00c41f96fc1e9a77d6d178d610b8fd962bf581 100644 (file)
--- a/package/kernel/rtc-rv5c386a/src/rtc.c
+++ b/package/kernel/rtc-rv5c386a/src/rtc.c
@@ -57,9 +57,6 @@
 #include <linux/uaccess.h>
 
 #include <asm/current.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-#include <asm/system.h>
-#endif
 
 #include <bcm47xx.h>
 #include <linux/bcm47xx_nvram.h>