From: "Rafał Miłecki" <zajec5@gmail.com>
To: Arend van Spriel <arend.vanspriel@broadcom.com>,
Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Franky Lin <franky.lin@broadcom.com>
Subject: Re: [PATCH 2/5] brcmfmac: move brcmf_fws_deinit to bcdc layer
Date: Wed, 29 Mar 2017 13:23:23 +0200 [thread overview]
Message-ID: <840eff3f-afac-4267-c5ef-a505a82f2db4@gmail.com> (raw)
In-Reply-To: <1490697808-5538-3-git-send-email-arend.vanspriel@broadcom.com>
On 03/28/2017 12:43 PM, Arend van Spriel wrote:
> From: Franky Lin <franky.lin@broadcom.com>
>
> Move brcmf_fws_deinit into brcmf_proto_bcdc_detach since it is a bcdc
> exclusive feature.
>
> Signed-off-by: Franky Lin <franky.lin@broadcom.com>
> Change-Id: Iefa5db632b92185a49d538b1cd25b7d8be618ce0
> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/8157
> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
> Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 1 +
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 7 -------
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> index bc24b00..67a132c1 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
> @@ -464,6 +464,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
>
> void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)
> {
> + brcmf_fws_deinit(drvr);
> kfree(drvr->proto->pd);
> drvr->proto->pd = NULL;
> }
I'd appreciate you commenting on someones work. I wouldn't mind "Move deinit to
brcmf_proto_bcdc_detach" comment so I could update my
[PATCH] brcmfmac: wrap brcmf_fws_(de)init into bcdc layer
if that is so important.
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> index 9886280..ba4da48 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> @@ -32,7 +32,6 @@
> #include "p2p.h"
> #include "cfg80211.h"
> #include "fwil.h"
> -#include "fwsignal.h"
> #include "feature.h"
> #include "proto.h"
> #include "pcie.h"
> @@ -1034,10 +1033,6 @@ int brcmf_bus_started(struct device *dev)
> brcmf_cfg80211_detach(drvr->config);
> drvr->config = NULL;
> }
> - if (drvr->fws) {
> - brcmf_proto_del_if(ifp->drvr, ifp);
> - brcmf_fws_deinit(drvr);
> - }
> brcmf_net_detach(ifp->ndev, false);
> if (p2p_ifp)
> brcmf_net_detach(p2p_ifp->ndev, false);
I don't like this. By removing del_if from error path you assume add_if doesn't
allocate any memory and it never will.
It's quite hacky for me. If you init something, then you should also deinit it.
Otherwise it's too easy to introduce an invalid state or add a memory leak.
Please keep code simple to follow.
next prev parent reply other threads:[~2017-03-29 11:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 10:43 [PATCH 0/5] brcmfmac: network namespace support Arend van Spriel
2017-03-28 10:43 ` [PATCH 1/5] brcmfmac: wrap brcmf_fws_init into bcdc layer Arend van Spriel
2017-03-29 11:18 ` Rafał Miłecki
2017-03-30 8:08 ` Arend Van Spriel
2017-04-03 11:52 ` Kalle Valo
2017-04-05 12:43 ` [1/5] " Kalle Valo
2017-03-28 10:43 ` [PATCH 2/5] brcmfmac: move brcmf_fws_deinit to " Arend van Spriel
2017-03-29 11:23 ` Rafał Miłecki [this message]
2017-03-30 8:52 ` Arend Van Spriel
2017-03-28 10:43 ` [PATCH 3/5] brcmfmac: add support to move wiphy instance into network namespace Arend van Spriel
2017-03-28 10:43 ` [PATCH 4/5] brcmfmac: restore bus state when enter_D3 fails Arend van Spriel
2017-03-28 10:43 ` [PATCH 5/5] brcmfmac: no need for d11inf instance in brcmf_pno_start_sched_scan() Arend van Spriel
2017-03-29 11:15 ` [PATCH 0/5] brcmfmac: network namespace support Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=840eff3f-afac-4267-c5ef-a505a82f2db4@gmail.com \
--to=zajec5@gmail.com \
--cc=arend.vanspriel@broadcom.com \
--cc=franky.lin@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).