[PATCH v2 1/2] ath9k: Fix MCI cleanup

[PATCH v2 1/2] ath9k: Fix MCI cleanup

[Mohammed Shafi Shajakhan]

From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>

We are doing MCI cleanup eventhough BTCOEX is not enabled
via module parameter. This means we do ath_mci_cleanup
though we skipped calling ath_mci_setup. Yet it does not
causes any issues now  as we free the DMA buffer allocated
only when it is allocated during ath_mci_setup.

Reviewed-by: Bala Shanmugam <bkamatch@qca.qualcomm.com>
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath9k/gpio.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 5eac4d1..43557c2 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -387,11 +387,13 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
 
 void ath9k_deinit_btcoex(struct ath_softc *sc)
 {
+	struct ath_hw *ah = sc->sc_ah;
+
         if ((sc->btcoex.no_stomp_timer) &&
 	    ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)
 		ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);
 
-	if (AR_SREV_9462(sc->sc_ah))
+	if (ath9k_hw_mci_is_enabled(ah))
 		ath_mci_cleanup(sc);
 }
 
-- 
1.7.0.4

Re: [PATCH v2 1/2] ath9k: Fix MCI cleanup

[Julian Calaby]

Hi Mohammed,

On Sat, Jul 7, 2012 at 12:39 AM, Mohammed Shafi Shajakhan
<mohammed@qca.qualcomm.com> wrote:
> From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
>
> We are doing MCI cleanup eventhough BTCOEX is not enabled
> via module parameter. This means we do ath_mci_cleanup
> though we skipped calling ath_mci_setup. Yet it does not
> causes any issues now  as we free the DMA buffer allocated
> only when it is allocated during ath_mci_setup.
>
> Reviewed-by: Bala Shanmugam <bkamatch@qca.qualcomm.com>
> Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
> ---
>  drivers/net/wireless/ath/ath9k/gpio.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
> index 5eac4d1..43557c2 100644
> --- a/drivers/net/wireless/ath/ath9k/gpio.c
> +++ b/drivers/net/wireless/ath/ath9k/gpio.c
> @@ -387,11 +387,13 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
>
>  void ath9k_deinit_btcoex(struct ath_softc *sc)
>  {
> +       struct ath_hw *ah = sc->sc_ah;
> +

Why introduce a new variable if you only use it once?

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/

Re: [PATCH v2 1/2] ath9k: Fix MCI cleanup

[Mohammed Shafi Shajakhan]

Hi Julian,

On Monday 09 July 2012 04:57 AM, Julian Calaby wrote:
> Hi Mohammed,
>
> On Sat, Jul 7, 2012 at 12:39 AM, Mohammed Shafi Shajakhan
> <mohammed@qca.qualcomm.com> wrote:
>> From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
>>
>> We are doing MCI cleanup eventhough BTCOEX is not enabled
>> via module parameter. This means we do ath_mci_cleanup
>> though we skipped calling ath_mci_setup. Yet it does not
>> causes any issues now  as we free the DMA buffer allocated
>> only when it is allocated during ath_mci_setup.
>>
>> Reviewed-by: Bala Shanmugam <bkamatch@qca.qualcomm.com>
>> Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
>> ---
>>   drivers/net/wireless/ath/ath9k/gpio.c |    4 +++-
>>   1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
>> index 5eac4d1..43557c2 100644
>> --- a/drivers/net/wireless/ath/ath9k/gpio.c
>> +++ b/drivers/net/wireless/ath/ath9k/gpio.c
>> @@ -387,11 +387,13 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
>>
>>   void ath9k_deinit_btcoex(struct ath_softc *sc)
>>   {
>> +       struct ath_hw *ah = sc->sc_ah;
>> +
>
> Why introduce a new variable if you only use it once?
>

oh yeah, could have avoided that (or) could have make use of it instead 
of sc->sc_ah in 2 places of the same function!

if ((sc->btcoex.no_stomp_timer) &&
             ath9k_hw_get_btcoex_scheme(sc->sc_ah) == ATH_BTCOEX_CFG_3WIRE)
                 ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);

thanks for your review, John had already merged with patch.
We could cleanup this in some future cleanups.


-- 
thanks,
shafi