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: AZltm8P6rtoAi6PKUVp+Sf6dlSkgqY9Rv2MeK8iKV9vEOL6x2HetFm3PHLB+n9b5rtV4ty4PbS
 wQQ00fQLirGEMRHxEqB4ws7NmXS/J1jIzcfs5y+hlNZI+v829LjBgtIZMI7jzYeevCq/B6CJFM
 XnrOv1QsNpCfmF1C+MyTzkoY0MPjqdca1cz5Sq+zEGWQxmaJ9pQb1jPNS8ZHBtGCSGIaW8Z1Kt
 Oov+BvXYhvIheFrxbFHeWh6B27gSS7mcRCUINO6AC4d+z+bUNCSZnuLiRPP3covSkQydyaXSWr
 DdY=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Ajay.Kathat@microchip.com>
Subject: [PATCH 09/12] wilc1000: avoid 'isinit' static by moving inside priv
 data
Thread-Topic: [PATCH 09/12] wilc1000: avoid 'isinit' static by moving inside
 priv data
Thread-Index: AQHXOG6kVjxRQlZHKE2uwKahITeHMw==
Date:   Fri, 23 Apr 2021 18:29:48 +0000
Message-ID: <20210423182925.5865-10-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: d0536074-855e-4683-291d-08d90685c6f8
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2021 18:29:48.6622
 (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: gY5IwVd7bDvrymLNAK/EaLby2P04+V1upKONWx/Kg5DG94VfCnyk7KZxO86PllapECUvcSKmPVlOwsoHD0enn9e9gQqRnvYwI3h90LYlb4I=
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>

Instead of using static variable(isinit) move to priv struct.
Added hif_is_init function to set is_init variable.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 .../net/wireless/microchip/wilc1000/sdio.c    | 13 +++++++++++
 drivers/net/wireless/microchip/wilc1000/spi.c | 22 +++++++++++++------
 .../net/wireless/microchip/wilc1000/wlan.c    |  2 +-
 .../net/wireless/microchip/wilc1000/wlan.h    |  1 +
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/w=
ireless/microchip/wilc1000/sdio.c
index db490f449c27..9c9f46a171b3 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -26,6 +26,7 @@ static const struct sdio_device_id wilc_sdio_ids[] =3D {
 struct wilc_sdio {
 	bool irq_gpio;
 	u32 block_size;
+	bool is_init;
 	int has_thrpt_enh3;
 };
=20
@@ -188,6 +189,13 @@ static int wilc_sdio_reset(struct wilc *wilc)
 	return 0;
 }
=20
+static bool wilc_sdio_is_init(struct wilc *wilc)
+{
+	struct wilc_sdio *sdio_priv =3D wilc->bus_data;
+
+	return sdio_priv->is_init;
+}
+
 static int wilc_sdio_suspend(struct device *dev)
 {
 	struct sdio_func *func =3D dev_to_sdio_func(dev);
@@ -576,6 +584,9 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, =
u8 *buf, u32 size)
=20
 static int wilc_sdio_deinit(struct wilc *wilc)
 {
+	struct wilc_sdio *sdio_priv =3D wilc->bus_data;
+
+	sdio_priv->is_init =3D false;
 	return 0;
 }
=20
@@ -695,6 +706,7 @@ static int wilc_sdio_init(struct wilc *wilc, bool resum=
e)
 			 sdio_priv->has_thrpt_enh3);
 	}
=20
+	sdio_priv->is_init =3D true;
 	return 0;
 }
=20
@@ -976,6 +988,7 @@ static const struct wilc_hif_func wilc_hif_sdio =3D {
 	.enable_interrupt =3D wilc_sdio_enable_interrupt,
 	.disable_interrupt =3D wilc_sdio_disable_interrupt,
 	.hif_reset =3D wilc_sdio_reset,
+	.hif_is_init =3D wilc_sdio_is_init,
 };
=20
 static int wilc_sdio_resume(struct device *dev)
diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wi=
reless/microchip/wilc1000/spi.c
index 4f5464170426..8e88986db9a4 100644
--- a/drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -42,6 +42,7 @@ struct wilc_spi {
 	bool probing_crc;	/* true if we're probing chip's CRC config */
 	bool crc7_enabled;	/* true if crc7 is currently enabled */
 	bool crc16_enabled;	/* true if crc16 is currently enabled */
+	bool is_init;
 };
=20
 static const struct wilc_hif_func wilc_hif_spi;
@@ -971,11 +972,19 @@ static int wilc_spi_reset(struct wilc *wilc)
 	return result;
 }
=20
+static bool wilc_spi_is_init(struct wilc *wilc)
+{
+	struct wilc_spi *spi_priv =3D wilc->bus_data;
+
+	return spi_priv->is_init;
+}
+
 static int wilc_spi_deinit(struct wilc *wilc)
 {
-	/*
-	 * TODO:
-	 */
+	struct wilc_spi *spi_priv =3D wilc->bus_data;
+
+	spi_priv->is_init =3D false;
+
 	return 0;
 }
=20
@@ -985,10 +994,9 @@ static int wilc_spi_init(struct wilc *wilc, bool resum=
e)
 	struct wilc_spi *spi_priv =3D wilc->bus_data;
 	u32 reg;
 	u32 chipid;
-	static int isinit;
 	int ret, i;
=20
-	if (isinit) {
+	if (spi_priv->is_init) {
 		ret =3D wilc_spi_read_reg(wilc, WILC_CHIPID, &chipid);
 		if (ret)
 			dev_err(&spi->dev, "Fail cmd read chip id...\n");
@@ -1059,8 +1067,7 @@ static int wilc_spi_init(struct wilc *wilc, bool resu=
me)
 		return ret;
 	}
=20
-	isinit =3D 1;
-
+	spi_priv->is_init =3D true;
 	return 0;
 }
=20
@@ -1189,4 +1196,5 @@ static const struct wilc_hif_func wilc_hif_spi =3D {
 	.hif_block_rx_ext =3D wilc_spi_read,
 	.hif_sync_ext =3D wilc_spi_sync_ext,
 	.hif_reset =3D wilc_spi_reset,
+	.hif_is_init =3D wilc_spi_is_init,
 };
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/w=
ireless/microchip/wilc1000/wlan.c
index 24e016a0dfa8..6ae5d82c6f99 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -1255,7 +1255,7 @@ void wilc_wlan_cleanup(struct net_device *dev)
 	wilc->rx_buffer =3D NULL;
 	kfree(wilc->tx_buffer);
 	wilc->tx_buffer =3D NULL;
-	wilc->hif_func->hif_deinit(NULL);
+	wilc->hif_func->hif_deinit(wilc);
 }
=20
 static int wilc_wlan_cfg_commit(struct wilc_vif *vif, int type,
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/w=
ireless/microchip/wilc1000/wlan.h
index 150648b2c872..8b7c3d1034ec 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.h
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.h
@@ -374,6 +374,7 @@ struct wilc_hif_func {
 	int (*enable_interrupt)(struct wilc *nic);
 	void (*disable_interrupt)(struct wilc *nic);
 	int (*hif_reset)(struct wilc *wilc);
+	bool (*hif_is_init)(struct wilc *wilc);
 };
=20
 #define WILC_MAX_CFG_FRAME_SIZE		1468
--=20
2.24.0