diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2016-06-17 08:47:00 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-19 02:45:55 (GMT) |
| commit | 516a4f04a39712cdb0d3cee263158853603376aa (patch) | |
| tree | fc8b04672d95f9cfa39403a7378d81431d49a1c6 | |
| parent | 6634cff1b545b8a6353e347c7871302353e5b7ca (diff) | |
| download | linux-516a4f04a39712cdb0d3cee263158853603376aa.tar.xz | |
staging: ks7010: drop private handler for driver version
We are upstream now, we don't need seperate driver versioning.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.h | 1 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_ioctl.h | 2 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 15 |
3 files changed, 2 insertions, 16 deletions
diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h index e71c097..c72064b 100644 --- a/drivers/staging/ks7010/ks7010_sdio.h +++ b/drivers/staging/ks7010/ks7010_sdio.h @@ -143,6 +143,5 @@ struct rx_device { spinlock_t rx_dev_lock; }; #define ROM_FILE "ks7010sd.rom" -#define KS_WLAN_DRIVER_VERSION_INFO "ks7010 sdio linux 007" #endif /* _KS7010_SDIO_H */ diff --git a/drivers/staging/ks7010/ks_wlan_ioctl.h b/drivers/staging/ks7010/ks_wlan_ioctl.h index f1fb2dd..49369e4 100644 --- a/drivers/staging/ks7010/ks_wlan_ioctl.h +++ b/drivers/staging/ks7010/ks_wlan_ioctl.h @@ -16,7 +16,7 @@ /* The low order bit identify a SET (0) or a GET (1) ioctl. */ /* SIOCIWFIRSTPRIV+0 */ -#define KS_WLAN_GET_DRIVER_VERSION SIOCIWFIRSTPRIV+1 +/* former KS_WLAN_GET_DRIVER_VERSION SIOCIWFIRSTPRIV+1 */ /* SIOCIWFIRSTPRIV+2 */ #define KS_WLAN_GET_FIRM_VERSION SIOCIWFIRSTPRIV+3 #ifdef WPS diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 8ef0f11..26dbb75 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -2199,17 +2199,6 @@ static int ks_wlan_set_mlme(struct net_device *dev, } /*------------------------------------------------------------------*/ -/* Private handler : get driver version */ -static int ks_wlan_get_driver_version(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *dwrq, char *extra) -{ - strcpy(extra, KS_WLAN_DRIVER_VERSION_INFO); - dwrq->length = strlen(KS_WLAN_DRIVER_VERSION_INFO) + 1; - return 0; -} - -/*------------------------------------------------------------------*/ /* Private handler : get firemware version */ static int ks_wlan_get_firmware_version(struct net_device *dev, struct iw_request_info *info, @@ -3128,8 +3117,6 @@ static int ks_wlan_hostt(struct net_device *dev, struct iw_request_info *info, static const struct iw_priv_args ks_wlan_private_args[] = { /*{ cmd, set_args, get_args, name[16] } */ - {KS_WLAN_GET_DRIVER_VERSION, IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_CHAR | (128 + 1), "GetDriverVer"}, {KS_WLAN_GET_FIRM_VERSION, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_CHAR | (128 + 1), "GetFirmwareVer"}, #ifdef WPS @@ -3258,7 +3245,7 @@ static const iw_handler ks_wlan_handler[] = { /* private_handler */ static const iw_handler ks_wlan_private_handler[] = { (iw_handler) NULL, /* 0 */ - (iw_handler) ks_wlan_get_driver_version, /* 1 KS_WLAN_GET_DRIVER_VERSION */ + (iw_handler) NULL, /* 1, used to be: KS_WLAN_GET_DRIVER_VERSION */ (iw_handler) NULL, /* 2 */ (iw_handler) ks_wlan_get_firmware_version, /* 3 KS_WLAN_GET_FIRM_VERSION */ #ifdef WPS |