Hello,
the motivation for this series is patch #3, patch #2 is a preparation for it
and patches #1 and #4 are just cleanups that I noticed en passant.
Best regards
Uwe
Uwe Kleine-König (4):
ath10k: Drop cleaning of driver data from probe error path and remove
ath10k: Drop checks that are always false
ath10k: Convert to platform remove callback returning void
atk10k: Don't opencode ath10k_pci_priv() in ath10k_ahb_priv()
drivers/net/wireless/ath/ath10k/ahb.c | 20 +++-----------------
drivers/net/wireless/ath/ath10k/snoc.c | 8 +++-----
2 files changed, 6 insertions(+), 22 deletions(-)
base-commit: ac9a78681b921877518763ba0e89202254349d1b
--
2.39.2
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 <[email protected]>
---
drivers/net/wireless/ath/ath10k/ahb.c | 3 ---
1 file changed, 3 deletions(-)
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;
}
--
2.39.2
Uwe Kleine-König <[email protected]> writes:
> the motivation for this series is patch #3, patch #2 is a preparation for it
> and patches #1 and #4 are just cleanups that I noticed en passant.
>
> Best regards
> Uwe
>
> Uwe Kleine-König (4):
> ath10k: Drop cleaning of driver data from probe error path and remove
> ath10k: Drop checks that are always false
> ath10k: Convert to platform remove callback returning void
> atk10k: Don't opencode ath10k_pci_priv() in ath10k_ahb_priv()
>
> drivers/net/wireless/ath/ath10k/ahb.c | 20 +++-----------------
> drivers/net/wireless/ath/ath10k/snoc.c | 8 +++-----
> 2 files changed, 6 insertions(+), 22 deletions(-)
ath10k patches go to my ath.git tree, not net-next. Also "wifi:" is
missing from the title but I can add that.
No need to resend because of these.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Hello Kalle,
On Thu, Jun 01, 2023 at 12:17:44PM +0300, Kalle Valo wrote:
> Uwe Kleine-K?nig <[email protected]> writes:
>
> > the motivation for this series is patch #3, patch #2 is a preparation for it
> > and patches #1 and #4 are just cleanups that I noticed en passant.
> >
> > Best regards
> > Uwe
> >
> > Uwe Kleine-K?nig (4):
> > ath10k: Drop cleaning of driver data from probe error path and remove
> > ath10k: Drop checks that are always false
> > ath10k: Convert to platform remove callback returning void
> > atk10k: Don't opencode ath10k_pci_priv() in ath10k_ahb_priv()
> >
> > drivers/net/wireless/ath/ath10k/ahb.c | 20 +++-----------------
> > drivers/net/wireless/ath/ath10k/snoc.c | 8 +++-----
> > 2 files changed, 6 insertions(+), 22 deletions(-)
>
> ath10k patches go to my ath.git tree, not net-next.
This isn't obvious for outsiders. Not sure what can be improved to
make this easier to spot.
> Also "wifi:" is missing from the title but I can add that.
oops, I wondered about that, too, but was sure that I used the prefix
from previous commits. Now that you said it, suddenly all previous
commits have this wifi prefix. Hmm, somebody must have tinkered with my
source tree :-)
Thanks for fixing my misdemeanors,
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Uwe Kleine-König <[email protected]> writes:
> Hello Kalle,
>
> On Thu, Jun 01, 2023 at 12:17:44PM +0300, Kalle Valo wrote:
>> Uwe Kleine-König <[email protected]> writes:
>>
>> > the motivation for this series is patch #3, patch #2 is a preparation for it
>> > and patches #1 and #4 are just cleanups that I noticed en passant.
>> >
>> > Best regards
>> > Uwe
>> >
>> > Uwe Kleine-König (4):
>> > ath10k: Drop cleaning of driver data from probe error path and remove
>> > ath10k: Drop checks that are always false
>> > ath10k: Convert to platform remove callback returning void
>> > atk10k: Don't opencode ath10k_pci_priv() in ath10k_ahb_priv()
>> >
>> > drivers/net/wireless/ath/ath10k/ahb.c | 20 +++-----------------
>> > drivers/net/wireless/ath/ath10k/snoc.c | 8 +++-----
>> > 2 files changed, 6 insertions(+), 22 deletions(-)
>>
>> ath10k patches go to my ath.git tree, not net-next.
>
> This isn't obvious for outsiders. Not sure what can be improved to
> make this easier to spot.
Yeah, you are definitely not the first one who is bitten by this. We do
have the tree documented in MAINTAINERS but that's easy to miss:
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
M: Kalle Valo <[email protected]>
L: [email protected]
S: Supported
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
F: Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
F: drivers/net/wireless/ath/ath10k/
And a rule of thumb is that all wireless patches do normally go to
wireless or wireless-next trees, and for most active wireless drivers we
have separate trees as well (like ath.git in this case).
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
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 <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Uwe Kleine-König <[email protected]> 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 <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>
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()
--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches