diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-05-31 12:56:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 22:42:53 -0700 |
| commit | 72bf750007297c33fe2331d2125118d4885367c2 (patch) | |
| tree | 6f5fc51bfa676e76e52d7426a601b8a87eb01d42 /drivers/staging/ks7010 | |
| parent | 4ab274017bc31cea220a531358e8c3e2d08d87fc (diff) | |
| download | linux-72bf750007297c33fe2331d2125118d4885367c2.tar.bz2 | |
staging: ks7010: remove code for old kernel versions
No need to be backwards compatible.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010')
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 9 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan.h | 28 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 3 |
3 files changed, 1 insertions, 39 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 6bea699655ee..146a1357909b 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -2103,11 +2103,7 @@ void hostif_sme_multicast_set(ks_wlan_private *priv) struct net_device *dev = priv->net_dev; int mc_count; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) struct netdev_hw_addr *ha; -#else - struct dev_mc_list *mclist; -#endif char set_address[NIC_MAX_MCAST_LIST*ETH_ALEN]; unsigned long filter_type; int i; @@ -2131,14 +2127,9 @@ void hostif_sme_multicast_set(ks_wlan_private *priv) else { if (priv->sme_i.sme_flag & SME_MULTICAST){ mc_count = netdev_mc_count(dev); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) netdev_for_each_mc_addr(ha, dev) { memcpy(&set_address[i*ETH_ALEN], ha->addr, ETH_ALEN); } -#else - for (i = 0, mclist = dev->mc_list; mclist && i < mc_count; i++, mclist = mclist->next) - memcpy(&set_address[i*ETH_ALEN], mclist->dmi_addr, ETH_ALEN); -#endif priv->sme_i.sme_flag &= ~SME_MULTICAST; hostif_mib_set_request(priv, LOCAL_MULTICAST_ADDRESS, (ETH_ALEN*mc_count), MIB_VALUE_TYPE_OSTRING, &set_address[0]); diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 329a062419fe..6bd016414a4f 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -18,9 +18,6 @@ #define WPS #include <linux/version.h> -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -#include <linux/config.h> -#endif #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/module.h> @@ -35,32 +32,9 @@ #include <linux/timer.h> /* struct timer_list */ #include <linux/string.h> #include <linux/completion.h> /* struct completion */ - -#include <asm/io.h> - -/* Workqueue / task queue backwards compatibility stuff */ -#if ((LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)) || (defined _MVL31_) || (defined _CELF3_)) #include <linux/workqueue.h> -#else -#include <linux/tqueue.h> -#define work_struct tq_struct -#define INIT_WORK INIT_TQUEUE -#define schedule_work schedule_task -#endif -/* Interrupt handler backwards compatibility stuff */ -/* -#ifndef IRQ_NONE -#define IRQ_NONE -#define IRQ_HANDLED -typedef void irqreturn_t; -#endif -*/ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) -#define free_netdev(x) kfree(x) -#define pci_name(x) x->slot_name -#endif +#include <asm/io.h> #include "ks7010_sdio.h" diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 185630cb423d..776a54403149 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -13,9 +13,6 @@ */ #include <linux/version.h> -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) -#include <linux/config.h> -#endif #include <linux/module.h> #include <linux/kernel.h> #include <linux/compiler.h> |