DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BE822083D
From:   <Adham.Abozaeid@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Ganesh.Krishna@microchip.com>, <Aditya.Shankar@microchip.com>,
        <johannes@sipsolutions.net>
Subject: [PATCH v3 1/4] staging: wilc1000: remove unused flags in
 handle_cfg_param()
Thread-Topic: [PATCH v3 1/4] staging: wilc1000: remove unused flags in
 handle_cfg_param()
Thread-Index: AQHUdWPXq5QzWW0E1UquqaT/6odJ9A==
Date:   Tue, 6 Nov 2018 00:01:17 +0000
Message-ID: <20181106000109.6178-2-adham.abozaeid@microchip.com>
References: <20181106000109.6178-1-adham.abozaeid@microchip.com>
In-Reply-To: <20181106000109.6178-1-adham.abozaeid@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;SN6PR11MB2639;6:TXJP3QzaZGGSblILNW7mBTaoTBN6+4L5goxLkSDsB21BWUZTP+OlasTzF+nmx2pq8o1DBCcaeE5ZVORfp8cUDKz+Gimm2HRTnjAE3DPQvhT+4zpXQN1fCNBwGEE2iB5P/nlYMcCqCd0of+S/KccbBU3wgbJhOT85sT56nE7dsyG/JmPQ3/shR8L0xSXbZtLqe1IPodMQ5nZ9d9luZThHW+tAVhqK8iZOUlBAvtmXyb3iYgfruDjAASvLDnmSCR4vQpitep6YGhWFAJMG1AFWkxhHVJRCp5zHQP8+Nj9XaPLhoX9K/61h49/E5FDl3eIxIm9ZQoSXWcG/n2bJdvAdM0CfhVX/cxIbPpMS2dTFnuO9QoDTucxGiXL4AVuFhGGRut7gbUN4OJIS8nbXrz/GniiVb/A+OWZ//6KUsI/LrFcPA2189OusVvqFnnBRGYmo6T0cyvt92Qn4DTBpvirTkA==;5:sNNrdTV+h2H03dysoNNUBZVYAP1rv8JCQHm+7JGCSqh9PNCSV0ENucWTuImQ1+DfVZ6mM21JhvoPa0ryo/bWCw5l9+mfW1/euOD1eMxwgHgtXDmR0Y5s/1HAdHZ0nzSJzFqTaqPcXeccnbjEdiSA7UlMx+iQVhqG+06i1N9OcTw=;7:5sY0julI7EwwUgfYH2oWiZrBmzj+0uFn27XhUOmn2rIDSI79uGk8Sens6nINkOrS7DXxTVYKLaxKTqIT3pnXKlZXQ9pO14FjxRc9JrNQXqBcuUPromfrgJNtfgKY9W6kw/7UQhlKW8oEzGFNsiiqAA==
x-ms-office365-filtering-correlation-id: 85729a53-e87f-49e3-f870-08d6437af95a
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:SN6PR11MB2639;
x-ms-traffictypediagnostic: SN6PR11MB2639:
x-microsoft-antispam-prvs: <SN6PR11MB26395ED9BA6C45A0802B50568DCB0@SN6PR11MB2639.namprd11.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:;
x-ms-exchange-senderadcheck: 1
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(3231382)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:SN6PR11MB2639;BCL:0;PCL:0;RULEID:;SRVR:SN6PR11MB2639;
x-forefront-prvs: 0848C1A6AA
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(396003)(39860400002)(346002)(366004)(136003)(189003)(199004)(99286004)(1076002)(3846002)(6116002)(8676002)(6486002)(6436002)(36756003)(86362001)(5640700003)(316002)(54906003)(6506007)(5660300001)(76176011)(72206003)(71190400001)(6916009)(52116002)(386003)(71200400001)(53936002)(6512007)(81156014)(81166006)(8936002)(14454004)(2906002)(256004)(68736007)(66066001)(14444005)(486006)(4326008)(478600001)(102836004)(2501003)(551544002)(186003)(26005)(305945005)(2351001)(11346002)(7736002)(2616005)(446003)(106356001)(105586002)(2900100001)(25786009)(97736004)(476003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR11MB2639;H:SN6PR11MB3407.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
x-microsoft-antispam-message-info: hmH6DdXRNBsnk+SYGLX3AjXxELl61oJ+yktDZjLy4u2XQsX7ZOXtj6QaDSc8Dh34GGFlSA6KJoTLQw4th31lOniQ5X4XZ0ZDIcPiQIahPWX2ECGTxSFD7z6CLYJDjOHvfOtgku5/pBV6egLXTX00ySp37l0S3iL80Ic+3OFEZO9LmLz13+2pclx3Bo8g6isNpodkM8+FKDTp7yE7B9sWYFbqTOUO9fw1/Oy0YsFNXLJju3zslgbzA7utJs1LIfYU/OfGtgfIhjr0XuEWBQccYXw23ZKNo8fvKbH5NSqCSwleBFXvRrnvet8SKLdDNb8M5/5oaF9ASlvvE+m7C1I/3zAut6WGj5b7bXgqkwAwEkc=
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 85729a53-e87f-49e3-f870-08d6437af95a
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Nov 2018 00:01:17.2086
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2639
X-OriginatorOrg: microchip.com
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Adham Abozaeid <adham.abozaeid@micochip.com>

handle_cfg_param() receives a bit map that describes what to be changed.
Some of these bits flags aren't referred to from elsewhere and can be
removed.

Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
---
 drivers/staging/wilc1000/host_interface.c | 216 ----------------------
 drivers/staging/wilc1000/host_interface.h |  29 ---
 drivers/staging/wilc1000/wilc_wlan_if.h   |   9 -
 3 files changed, 254 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wi=
lc1000/host_interface.c
index c4f858b22914..b89116c57064 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -374,64 +374,6 @@ static void handle_cfg_param(struct work_struct *work)
=20
 	mutex_lock(&hif_drv->cfg_values_lock);
=20
-	if (param->flag & BSS_TYPE) {
-		u8 bss_type =3D param->bss_type;
-
-		if (bss_type < 6) {
-			wid_list[i].id =3D WID_BSS_TYPE;
-			wid_list[i].val =3D (s8 *)&param->bss_type;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.bss_type =3D bss_type;
-		} else {
-			netdev_err(vif->ndev, "check value 6 over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & AUTH_TYPE) {
-		u8 auth_type =3D param->auth_type;
-
-		if (auth_type =3D=3D 1 || auth_type =3D=3D 2 || auth_type =3D=3D 5) {
-			wid_list[i].id =3D WID_AUTH_TYPE;
-			wid_list[i].val =3D (s8 *)&param->auth_type;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.auth_type =3D auth_type;
-		} else {
-			netdev_err(vif->ndev, "Impossible value\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & AUTHEN_TIMEOUT) {
-		if (param->auth_timeout > 0) {
-			wid_list[i].id =3D WID_AUTH_TIMEOUT;
-			wid_list[i].val =3D (s8 *)&param->auth_timeout;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.auth_timeout =3D param->auth_timeout;
-		} else {
-			netdev_err(vif->ndev, "Range(1 ~ 65535) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & POWER_MANAGEMENT) {
-		u8 pm_mode =3D param->power_mgmt_mode;
-
-		if (pm_mode < 5) {
-			wid_list[i].id =3D WID_POWER_MANAGEMENT;
-			wid_list[i].val =3D (s8 *)&param->power_mgmt_mode;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.power_mgmt_mode =3D pm_mode;
-		} else {
-			netdev_err(vif->ndev, "Invalid power mode\n");
-			goto unlock;
-		}
-		i++;
-	}
 	if (param->flag & RETRY_SHORT) {
 		u16 retry_limit =3D param->short_retry_limit;
=20
@@ -492,160 +434,6 @@ static void handle_cfg_param(struct work_struct *work=
)
 		}
 		i++;
 	}
-	if (param->flag & PREAMBLE) {
-		u16 preamble_type =3D param->preamble_type;
-
-		if (param->preamble_type < 3) {
-			wid_list[i].id =3D WID_PREAMBLE;
-			wid_list[i].val =3D (s8 *)&param->preamble_type;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.preamble_type =3D preamble_type;
-		} else {
-			netdev_err(vif->ndev, "Preamble Range(0~2) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & SHORT_SLOT_ALLOWED) {
-		u8 slot_allowed =3D param->short_slot_allowed;
-
-		if (slot_allowed < 2) {
-			wid_list[i].id =3D WID_SHORT_SLOT_ALLOWED;
-			wid_list[i].val =3D (s8 *)&param->short_slot_allowed;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.short_slot_allowed =3D slot_allowed;
-		} else {
-			netdev_err(vif->ndev, "Short slot(2) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & TXOP_PROT_DISABLE) {
-		u8 prot_disabled =3D param->txop_prot_disabled;
-
-		if (param->txop_prot_disabled < 2) {
-			wid_list[i].id =3D WID_11N_TXOP_PROT_DISABLE;
-			wid_list[i].val =3D (s8 *)&param->txop_prot_disabled;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.txop_prot_disabled =3D prot_disabled;
-		} else {
-			netdev_err(vif->ndev, "TXOP prot disable\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & BEACON_INTERVAL) {
-		u16 beacon_interval =3D param->beacon_interval;
-
-		if (beacon_interval > 0) {
-			wid_list[i].id =3D WID_BEACON_INTERVAL;
-			wid_list[i].val =3D (s8 *)&param->beacon_interval;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.beacon_interval =3D beacon_interval;
-		} else {
-			netdev_err(vif->ndev, "Beacon interval(1~65535)fail\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & DTIM_PERIOD) {
-		if (param->dtim_period > 0 && param->dtim_period < 256) {
-			wid_list[i].id =3D WID_DTIM_PERIOD;
-			wid_list[i].val =3D (s8 *)&param->dtim_period;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.dtim_period =3D param->dtim_period;
-		} else {
-			netdev_err(vif->ndev, "DTIM range(1~255) fail\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & SITE_SURVEY) {
-		enum site_survey enabled =3D param->site_survey_enabled;
-
-		if (enabled < 3) {
-			wid_list[i].id =3D WID_SITE_SURVEY;
-			wid_list[i].val =3D (s8 *)&param->site_survey_enabled;
-			wid_list[i].type =3D WID_CHAR;
-			wid_list[i].size =3D sizeof(char);
-			hif_drv->cfg_values.site_survey_enabled =3D enabled;
-		} else {
-			netdev_err(vif->ndev, "Site survey disable\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & SITE_SURVEY_SCAN_TIME) {
-		u16 scan_time =3D param->site_survey_scan_time;
-
-		if (scan_time > 0) {
-			wid_list[i].id =3D WID_SITE_SURVEY_SCAN_TIME;
-			wid_list[i].val =3D (s8 *)&param->site_survey_scan_time;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.site_survey_scan_time =3D scan_time;
-		} else {
-			netdev_err(vif->ndev, "Site scan time(1~65535) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & ACTIVE_SCANTIME) {
-		u16 active_scan_time =3D param->active_scan_time;
-
-		if (active_scan_time > 0) {
-			wid_list[i].id =3D WID_ACTIVE_SCAN_TIME;
-			wid_list[i].val =3D (s8 *)&param->active_scan_time;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.active_scan_time =3D active_scan_time;
-		} else {
-			netdev_err(vif->ndev, "Active time(1~65535) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & PASSIVE_SCANTIME) {
-		u16 time =3D param->passive_scan_time;
-
-		if (time > 0) {
-			wid_list[i].id =3D WID_PASSIVE_SCAN_TIME;
-			wid_list[i].val =3D (s8 *)&param->passive_scan_time;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.passive_scan_time =3D time;
-		} else {
-			netdev_err(vif->ndev, "Passive time(1~65535) over\n");
-			goto unlock;
-		}
-		i++;
-	}
-	if (param->flag & CURRENT_TX_RATE) {
-		enum current_tx_rate curr_tx_rate =3D param->curr_tx_rate;
-
-		if (curr_tx_rate =3D=3D AUTORATE || curr_tx_rate =3D=3D MBPS_1 ||
-		    curr_tx_rate =3D=3D MBPS_2 || curr_tx_rate =3D=3D MBPS_5_5 ||
-		    curr_tx_rate =3D=3D MBPS_11 || curr_tx_rate =3D=3D MBPS_6 ||
-		    curr_tx_rate =3D=3D MBPS_9 || curr_tx_rate =3D=3D MBPS_12 ||
-		    curr_tx_rate =3D=3D MBPS_18 || curr_tx_rate =3D=3D MBPS_24 ||
-		    curr_tx_rate =3D=3D MBPS_36 || curr_tx_rate =3D=3D MBPS_48 ||
-		    curr_tx_rate =3D=3D MBPS_54) {
-			wid_list[i].id =3D WID_CURRENT_TX_RATE;
-			wid_list[i].val =3D (s8 *)&curr_tx_rate;
-			wid_list[i].type =3D WID_SHORT;
-			wid_list[i].size =3D sizeof(u16);
-			hif_drv->cfg_values.curr_tx_rate =3D (u8)curr_tx_rate;
-		} else {
-			netdev_err(vif->ndev, "out of TX rate\n");
-			goto unlock;
-		}
-		i++;
-	}
=20
 	ret =3D wilc_send_config_pkt(vif, SET_CFG, wid_list,
 				   i, wilc_get_vif_idx(vif));
@@ -3489,11 +3277,7 @@ int wilc_init(struct net_device *dev, struct host_if=
_drv **hif_drv_handler)
 	mutex_lock(&hif_drv->cfg_values_lock);
=20
 	hif_drv->hif_state =3D HOST_IF_IDLE;
-	hif_drv->cfg_values.site_survey_enabled =3D SITE_SURVEY_OFF;
 	hif_drv->cfg_values.scan_source =3D DEFAULT_SCAN;
-	hif_drv->cfg_values.active_scan_time =3D ACTIVE_SCAN_TIME;
-	hif_drv->cfg_values.passive_scan_time =3D PASSIVE_SCAN_TIME;
-	hif_drv->cfg_values.curr_tx_rate =3D AUTORATE;
=20
 	hif_drv->p2p_timeout =3D 0;
=20
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wi=
lc1000/host_interface.h
index 5f8d30f47cd6..df9fc33be094 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -158,26 +158,11 @@ enum current_tx_rate {
 struct cfg_param_attr {
 	u32 flag;
 	u8 ht_enable;
-	u8 bss_type;
-	u8 auth_type;
-	u16 auth_timeout;
-	u8 power_mgmt_mode;
 	u16 short_retry_limit;
 	u16 long_retry_limit;
 	u16 frag_threshold;
 	u16 rts_threshold;
-	u16 preamble_type;
-	u8 short_slot_allowed;
-	u8 txop_prot_disabled;
-	u16 beacon_interval;
-	u16 dtim_period;
-	enum site_survey site_survey_enabled;
-	u16 site_survey_scan_time;
 	u8 scan_source;
-	u16 active_scan_time;
-	u16 passive_scan_time;
-	enum current_tx_rate curr_tx_rate;
-
 };
=20
 enum cfg_param {
@@ -185,20 +170,6 @@ enum cfg_param {
 	RETRY_LONG		=3D BIT(1),
 	FRAG_THRESHOLD		=3D BIT(2),
 	RTS_THRESHOLD		=3D BIT(3),
-	BSS_TYPE		=3D BIT(4),
-	AUTH_TYPE		=3D BIT(5),
-	AUTHEN_TIMEOUT		=3D BIT(6),
-	POWER_MANAGEMENT	=3D BIT(7),
-	PREAMBLE		=3D BIT(8),
-	SHORT_SLOT_ALLOWED	=3D BIT(9),
-	TXOP_PROT_DISABLE	=3D BIT(10),
-	BEACON_INTERVAL		=3D BIT(11),
-	DTIM_PERIOD		=3D BIT(12),
-	SITE_SURVEY		=3D BIT(13),
-	SITE_SURVEY_SCAN_TIME	=3D BIT(14),
-	ACTIVE_SCANTIME		=3D BIT(15),
-	PASSIVE_SCANTIME	=3D BIT(16),
-	CURRENT_TX_RATE		=3D BIT(17),
 	HT_ENABLE		=3D BIT(18),
 };
=20
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc=
1000/wilc_wlan_if.h
index ce2066b74287..4f258bf6a48d 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -698,13 +698,8 @@ enum {
 	WID_LONG_RETRY_LIMIT		=3D 0x1003,
 	WID_BEACON_INTERVAL		=3D 0x1006,
 	WID_MEMORY_ACCESS_16BIT		=3D 0x1008,
-	WID_RX_SENSE			=3D 0x100B,
-	WID_ACTIVE_SCAN_TIME		=3D 0x100C,
-	WID_PASSIVE_SCAN_TIME		=3D 0x100D,
=20
-	WID_SITE_SURVEY_SCAN_TIME	=3D 0x100E,
 	WID_JOIN_START_TIMEOUT		=3D 0x100F,
-	WID_AUTH_TIMEOUT		=3D 0x1010,
 	WID_ASOC_TIMEOUT		=3D 0x1011,
 	WID_11I_PROTOCOL_TIMEOUT	=3D 0x1012,
 	WID_EAPOL_RESPONSE_TIMEOUT	=3D 0x1013,
@@ -739,11 +734,8 @@ enum {
 	WID_HW_RX_COUNT			=3D 0x2015,
 	WID_MEMORY_ADDRESS		=3D 0x201E,
 	WID_MEMORY_ACCESS_32BIT		=3D 0x201F,
-	WID_RF_REG_VAL			=3D 0x2021,
=20
 	/* NMAC Integer WID list */
-	WID_11N_PHY_ACTIVE_REG_VAL	=3D 0x2080,
-
 	/* Custom Integer WID list */
 	WID_GET_INACTIVE_TIME		=3D 0x2084,
 	WID_SET_OPERATION_MODE		=3D 0X2086,
@@ -764,7 +756,6 @@ enum {
 	WID_SUPP_PASSWORD		=3D 0x3011,
 	WID_SITE_SURVEY_RESULTS		=3D 0x3012,
 	WID_RX_POWER_LEVEL		=3D 0x3013,
-	WID_DEL_ALL_RX_BA		=3D 0x3014,
 	WID_SET_STA_MAC_INACTIVE_TIME	=3D 0x3017,
 	WID_ADD_WEP_KEY			=3D 0x3019,
 	WID_REMOVE_WEP_KEY		=3D 0x301A,
--=20
2.17.1