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: PzYVRgAbO+Jy/1r6gTv+ibf83eYXcsHe9q1wpUObyssnL7UpRxbroEvgHMn/I/hRQWWBmr/MUr
 O7Ch5jtQWk6XGu+FMsJVYbQvZ0+xPuOWDI/gvuN2lT6/pWeMqk5u7fw4cfMLdQP34GjVXsn99K
 byzPOlzlv09lGmQvg9HCJz6+zsLvTVnwZanuR/GOD2l9mwlDRilb8/Ff/6GwhBkZVPBiVD1ASs
 +p8DcnU+vw+qfPDJqqhkxChy8lJE6GI3dF63yezB2muLtem+777HAKf2xZkwgdV4PqKc9hOg9a
 /moGS0dxYFxk+odahlsP/8g+
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Ajay.Kathat@microchip.com>
Subject: [PATCH v2 01/11] wilc1000: move 'deinit_lock' lock init/destroy
 inside module probe
Thread-Topic: [PATCH v2 01/11] wilc1000: move 'deinit_lock' lock init/destroy
 inside module probe
Thread-Index: AQHXqxrJxDjNG40dJk6FUWrJpJ0RwA==
Date:   Thu, 16 Sep 2021 16:49:17 +0000
Message-ID: <20210916164902.74629-2-ajay.kathat@microchip.com>
References: <20210916164902.74629-1-ajay.kathat@microchip.com>
In-Reply-To: <20210916164902.74629-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?hS7uZ7fpRt+n65lLplURc2J9i/TGQ+FwUAe5dzbA9TFQE+RLP9paJd+fTl?=
 =?iso-8859-1?Q?acj/9liRsxyA82vTyGDD1Rlo+TIIhBaPmMTW12ZiauiWUqVN06j4e//NKR?=
 =?iso-8859-1?Q?CjA2dURTsAjEU+Zt2drOnzzILPoYCdQ5uKvF3iLHVpHm6s8bQYJHZgsp9x?=
 =?iso-8859-1?Q?7ID9eUNO+PCXaU9/bRvlqShea8mRr/JiRdsY/zgRbDcXFMA4WzeZo3sgGz?=
 =?iso-8859-1?Q?6JpoaDSyVoOkl29hkShbAHcc4d8kzX2w9vLUIZZPRyh8Kf7HlnZcD5BeMF?=
 =?iso-8859-1?Q?ybqWPi729Sc/DkONyhxHAIMUZ+2kZMxF1D8+Lw5B2VCnOYxmTOoPbVQIZe?=
 =?iso-8859-1?Q?0q6q5zoQ7CZ9aFzJ157MWHceMTqM5qGXbVS7g3minN/ISaEx9KrS82pJ5A?=
 =?iso-8859-1?Q?btfs0DB7x7XjeVCansP8SL4g8KLICC0tSs/sBz+7U/RoPJIsZt4rM/4I1k?=
 =?iso-8859-1?Q?gLZ6QBrb48HAgcg6RpZqSDSCBpyQA/UMOtbJx8ntB6RpvSABrGYJvc+UaC?=
 =?iso-8859-1?Q?fcXKejm2kIZG+2tEXQFLm6RjBFSKc4FEb8PtrjtiLoOVTpjbx8awoSCdA8?=
 =?iso-8859-1?Q?Ksc+h5M7Q5Xgst5Cv9A8rA8QRSgLBV1gRGt7x//2Yb71odMwpyBryoTlXT?=
 =?iso-8859-1?Q?zDbtZLuaiPZ8qPfbWXz7VO+oChkt0nkVaPSvBolKADpsxcIg2LbkiLhXI1?=
 =?iso-8859-1?Q?H8MdFCwWsWG4H3ilubHmVpK/lPmD2ZS9WwVWXnYxQZjzTPU+rkiaYfD++S?=
 =?iso-8859-1?Q?1ydt8f7qjj8klL499+wfnpf5G/W0QpqwDRzAYo8obgMDxa22Kw6NyaZZnj?=
 =?iso-8859-1?Q?FddP75JFzI/JjMU5W1q9HLn9zy300vVW16Sl1X6DfeG2dHuaLeWPkxgsxD?=
 =?iso-8859-1?Q?BNtqDKcsG2+TZCgIfsi6r6YZeneUUzChmdCaUpnlOp3f0rsqJS38Cdotsb?=
 =?iso-8859-1?Q?opY9ez6y/s8JP7RRHm/XDY3HlfQi5e1VxR5UV2OLjyNJwMSGnZwH+jT+v7?=
 =?iso-8859-1?Q?46Aelw9rDPQgLUVTWmbAXquYxrVVyMbMTduC3c5xiXeQm3PYzxIhNCJ9Df?=
 =?iso-8859-1?Q?8AsXTB8VYDHKXrViSNBZvotJ1zVtK0ml5gUIHobj2YxAwkHAh1ETi4biPq?=
 =?iso-8859-1?Q?2BpGlwnmkV0L0gAFFHLrxGNITywNWTV8fcJGVCjVgWtgZ6FE96Z+3xBXaH?=
 =?iso-8859-1?Q?r7ll+a3mMWkXdWum4eGAXkQPYvIMvWvIOb+DWLEZlHhfgLe3YMCrzz55wQ?=
 =?iso-8859-1?Q?merRzt3lTcndy6STSvpnKxrGogbhjaJszv6e7QriCB3be0mIHaOoLHUjgX?=
 =?iso-8859-1?Q?OPpHgilhQsj4L9Qks66JAHy8O9t0At4cucB/EmBAhfJk0M3iz6z+YDlxKM?=
 =?iso-8859-1?Q?om6RR4Sulc?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB4943.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee3b3eb1-2a8a-4dac-7f9a-08d97931ec6a
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 16:49:17.4843
 (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: fubJcmE2vwpybmf0zsLNPEoPckWt7xa1A9ypcKn53rPN23VGWIom3j7Rgp5Sr3enW+Sq+YSWLU2HLUdouwgnYLYgidMF9otUCTMC4mSU0Lw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197
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
wlan_init_locks() & wlan_deinit_locks() API's respectively alongside other
locks. After the movement, the client count variable(client_count) which is
used for lock init/deinit is removed.

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.25.1