| Message ID | 20230601082556.2738446-2-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ec3b1ce2ca347b4b0a7cd5d1b69c316840202df3 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | Convert to platform remove callback returning void | expand |
On Thu, Jun 01, 2023 at 10:25:53AM +0200, Uwe Kleine-König wrote: > The driver core cares for resetting driver data if probe fails and after > remove. So drop the explicit and duplicate cleanup in the driver's > functions. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > The driver core cares for resetting driver data if probe fails and after > remove. So drop the explicit and duplicate cleanup in the driver's > functions. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 4 patches applied to ath-next branch of ath.git, thanks. ec3b1ce2ca34 wifi: ath10k: Drop cleaning of driver data from probe error path and remove fad5ac80dfa5 wifi: ath10k: Drop checks that are always false d457bff27633 wifi: ath10k: Convert to platform remove callback returning void 6358b1037157 wifi: atk10k: Don't opencode ath10k_pci_priv() in ath10k_ahb_priv()
diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c index f0c615fa5614..7bb45c66cff7 100644 --- a/drivers/net/wireless/ath/ath10k/ahb.c +++ b/drivers/net/wireless/ath/ath10k/ahb.c @@ -816,7 +816,6 @@ static int ath10k_ahb_probe(struct platform_device *pdev) err_core_destroy: ath10k_core_destroy(ar); - platform_set_drvdata(pdev, NULL); return ret; } @@ -845,8 +844,6 @@ static int ath10k_ahb_remove(struct platform_device *pdev) ath10k_ahb_resource_deinit(ar); ath10k_core_destroy(ar); - platform_set_drvdata(pdev, NULL); - return 0; }
The driver core cares for resetting driver data if probe fails and after remove. So drop the explicit and duplicate cleanup in the driver's functions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/net/wireless/ath/ath10k/ahb.c | 3 --- 1 file changed, 3 deletions(-)