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: OioUDkXsT0OGJjrQKd5N7aVSDToLajFhWrDUoMtKBddgVmI6Tt8sqwbxCbVjdzUSltj4uA4r2c
 8SYMTg7VLgtJeFOLuEl9Erpc+fr3YsvLmrg6kN8iRhqlb4qrDW0CBhmG6P4VmaU2MX1yMJPRwO
 aJ4OSeIOYw54YtSiv52RsUbHe87hUBwByS/7WWySNy6HezDPKU/CMXIQyaGl7dKYY6Qqb1ZDYD
 3xM0n1EMqCfyrNvf7tWOxqCp0p291EuHjjRbflxbvttWztLsZX/u76IK7NfFwzTYzNU+HpoYI3
 y6c=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>, <kvalo@codeaurora.org>
CC:     <Claudiu.Beznea@microchip.com>, <Ajay.Kathat@microchip.com>
Subject: [PATCH v2] wilc1000: use wilc handler as cookie in
 request_threaded_irq()
Thread-Topic: [PATCH v2] wilc1000: use wilc handler as cookie in
 request_threaded_irq()
Thread-Index: AQHXCy3tDOxH11sOa0C8Y0/ug/HApg==
Date:   Thu, 25 Feb 2021 04:23:10 +0000
Message-ID: <20210225042302.17048-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: cd82d2fd-7525-492a-a137-08d8d9450f9c
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Feb 2021 04:23:11.0171
 (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: V/NqNlAGYC1c0v+uWL2K2DTeihNYN/RQ7UbocXY31MclQaZOkr6KtMvfYTG56AqAMg6T8LccTLUEqq8Ep4U1UTjOEvnK83+m7oEsukZLdhc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2663
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

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

Use same cookie for request_threaded_irq() & free_irq() to properly free
IRQ during module unload. free_irq() already uses *wilc* handler so the
changes are required for request_threaded_irq().

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/netdev.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net=
/wireless/microchip/wilc1000/netdev.c
index 1b205e7d97a8..9928e91c8ffa 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -24,12 +24,10 @@
=20
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
-	struct net_device *dev =3D user_data;
-	struct wilc_vif *vif =3D netdev_priv(dev);
-	struct wilc *wilc =3D vif->wilc;
+	struct wilc *wilc =3D user_data;
=20
 	if (wilc->close) {
-		netdev_err(dev, "Can't handle UH interrupt\n");
+		pr_err("Can't handle UH interrupt");
 		return IRQ_HANDLED;
 	}
 	return IRQ_WAKE_THREAD;
@@ -37,12 +35,10 @@ static irqreturn_t isr_uh_routine(int irq, void *user_d=
ata)
=20
 static irqreturn_t isr_bh_routine(int irq, void *userdata)
 {
-	struct net_device *dev =3D userdata;
-	struct wilc_vif *vif =3D netdev_priv(userdata);
-	struct wilc *wilc =3D vif->wilc;
+	struct wilc *wilc =3D userdata;
=20
 	if (wilc->close) {
-		netdev_err(dev, "Can't handle BH interrupt\n");
+		pr_err("Can't handle BH interrupt\n");
 		return IRQ_HANDLED;
 	}
=20
@@ -60,7 +56,7 @@ static int init_irq(struct net_device *dev)
 	ret =3D request_threaded_irq(wl->dev_irq_num, isr_uh_routine,
 				   isr_bh_routine,
 				   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-				   "WILC_IRQ", dev);
+				   "WILC_IRQ", wl);
 	if (ret) {
 		netdev_err(dev, "Failed to request IRQ [%d]\n", ret);
 		return ret;
--=20
2.24.0