Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: NuTfEYYnnOLEXFsC9HUw52WfFXvzUtch9snzCbaWTPyEfOlvDUjFwZIyBoXM6kTjZeT+9Okv1d
 eMAS/iO8rZnMmfwz3S9kHkYuBFjWIgA1rdzBjA+jJApBrupVCuEagkwPKE3tMnIl3DZ+wBhHvk
 S+udDVRuO+OprxVNV48W3I45J669KBBbYbMnzzM/6oNTXDOeEn9pKm2eE0UtMyfOI9JdHGbbSd
 3AdO3Lvhr/PzK3Js6MWB9SbZYiNJhBbm5FFm/wykdKAa7oScd2SAlvdv/p1UGiVMvlD/1KEs5w
 l1U=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Ajay.Kathat@microchip.com>
Subject: [PATCH 01/12] wilc1000: move 'deinit_lock' lock init/destory inside
 module probe
Thread-Topic: [PATCH 01/12] wilc1000: move 'deinit_lock' lock init/destory
 inside module probe
Thread-Index: AQHXOG6fh5Se5HWONEeyioxi64smcA==
Date:   Fri, 23 Apr 2021 18:29:41 +0000
Message-ID: <20210423182925.5865-2-ajay.kathat@microchip.com>
References: <20210423182925.5865-1-ajay.kathat@microchip.com>
In-Reply-To: <20210423182925.5865-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: bb86589c-d1ed-427f-3915-08d90685c277
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2021 18:29:41.1441
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: RQ8yNTQVDAh5Eq/KetMvUjbajUwFogaJD1q9CEuDgNibK5MNO6V3TjvvaRS+5TuAkE1cwG6tDPw2112XxEEgCvNqH/AwXjfZVkUCmQBuHpg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3493
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Move initialization & deinitialization of 'deinit_lock' mutex lock
inside driver init and deinit respectively alongside other locks
initialization. After following changes no need to maintain client count
variable(client_count) just to init/destroy the lock.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 ++
 drivers/net/wireless/microchip/wilc1000/hif.c      | 7 -------
 drivers/net/wireless/microchip/wilc1000/netdev.h   | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/n=
et/wireless/microchip/wilc1000/cfg80211.c
index 96973ec7bd9a..530a768547cc 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -1683,6 +1683,7 @@ static void wlan_init_locks(struct wilc *wl)
 	mutex_init(&wl->rxq_cs);
 	mutex_init(&wl->cfg_cmd_lock);
 	mutex_init(&wl->vif_mutex);
+	mutex_init(&wl->deinit_lock);
=20
 	spin_lock_init(&wl->txq_spinlock);
 	mutex_init(&wl->txq_add_to_head_cs);
@@ -1701,6 +1702,7 @@ void wlan_deinit_locks(struct wilc *wilc)
 	mutex_destroy(&wilc->cfg_cmd_lock);
 	mutex_destroy(&wilc->txq_add_to_head_cs);
 	mutex_destroy(&wilc->vif_mutex);
+	mutex_destroy(&wilc->deinit_lock);
 	cleanup_srcu_struct(&wilc->srcu);
 }
=20
diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wi=
reless/microchip/wilc1000/hif.c
index a133736a7821..497a49a182ef 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -1494,7 +1494,6 @@ int wilc_init(struct net_device *dev, struct host_if_=
drv **hif_drv_handler)
 {
 	struct host_if_drv *hif_drv;
 	struct wilc_vif *vif =3D netdev_priv(dev);
-	struct wilc *wilc =3D vif->wilc;
=20
 	hif_drv  =3D kzalloc(sizeof(*hif_drv), GFP_KERNEL);
 	if (!hif_drv)
@@ -1504,9 +1503,6 @@ int wilc_init(struct net_device *dev, struct host_if_=
drv **hif_drv_handler)
=20
 	vif->hif_drv =3D hif_drv;
=20
-	if (wilc->clients_count =3D=3D 0)
-		mutex_init(&wilc->deinit_lock);
-
 	timer_setup(&vif->periodic_rssi, get_periodic_rssi, 0);
 	mod_timer(&vif->periodic_rssi, jiffies + msecs_to_jiffies(5000));
=20
@@ -1518,8 +1514,6 @@ int wilc_init(struct net_device *dev, struct host_if_=
drv **hif_drv_handler)
=20
 	hif_drv->p2p_timeout =3D 0;
=20
-	wilc->clients_count++;
-
 	return 0;
 }
=20
@@ -1550,7 +1544,6 @@ int wilc_deinit(struct wilc_vif *vif)
=20
 	kfree(hif_drv);
 	vif->hif_drv =3D NULL;
-	vif->wilc->clients_count--;
 	mutex_unlock(&vif->wilc->deinit_lock);
 	return result;
 }
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net=
/wireless/microchip/wilc1000/netdev.h
index 86209b391a3d..a39c62a20f04 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.h
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.h
@@ -264,7 +264,6 @@ struct wilc {
 	struct device *dev;
 	bool suspend_event;
=20
-	int clients_count;
 	struct workqueue_struct *hif_workqueue;
 	enum chip_ps_states chip_ps_state;
 	struct wilc_cfg cfg;
--=20
2.24.0