Thread (4 messages) 4 messages, 3 authors, 2022-07-27
STALE1429d LANDED

[PATCH] wlcore/wl12xx: Drop if with an always false condition

From: Uwe Kleine-König <hidden>
Date: 2022-07-15 22:46:36
Also in: linux-wireless
Subsystem: the rest, ti wilink wireless drivers · Maintainer: Linus Torvalds

The remove callback is only called after probe completed successfully.
In this case platform_set_drvdata() was called with a non-NULL argument
(in wlcore_probe()) and so wl is never NULL.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <redacted>
---
On Fri, Jul 15, 2022 at 09:00:42AM -0700, Florian Fainelli wrote:
On 7/15/22 03:30, Uwe Kleine-König wrote:
quoted
The remove callback is only called after probe completed successfully.
In this case platform_set_drvdata() was called with a non-NULL argument
(in wlcore_probe()) and so wl is never NULL.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <redacted>
The subject appears to have been borrowed from another file/subsystem.
Damn! Fixed here. Thanks for your feedback.

Best regards
Uwe

 drivers/net/wireless/ti/wl12xx/main.c | 3 ---
 1 file changed, 3 deletions(-)
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index c6da0cfb4afb..d06a2c419447 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1924,13 +1924,10 @@ static int wl12xx_remove(struct platform_device *pdev)
 	struct wl1271 *wl = platform_get_drvdata(pdev);
 	struct wl12xx_priv *priv;
 
-	if (!wl)
-		goto out;
 	priv = wl->priv;
 
 	kfree(priv->rx_mem_addr);
 
-out:
 	return wlcore_remove(pdev);
 }
 
base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
-- 
2.36.1


-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help