2022-02-15 09:33:29

by Bo Jiao

Subject: [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev

From: Bo Jiao <[email protected]>

fix logic error and remove the unused member 'adie' of mt7915_dev.

Fixes: 91eeaef2523f ("mt76: mt7915: add support for MT7986")
Signed-off-by: Bo Jiao <[email protected]>
---
- please fold this into previous commit.
---
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 4 ++--
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 6a4fb4c..6b3749b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -589,10 +589,10 @@ static void mt7915_wfsys_reset(struct mt7915_dev *dev)

msleep(100);
} else if (is_mt7986(&dev->mt76)) {
- mt7986_wmac_enable(dev);
+ mt7986_wmac_disable(dev);
msleep(20);

- mt7986_wmac_disable(dev);
+ mt7986_wmac_enable(dev);
msleep(20);
} else {
mt76_set(dev, MT_WF_SUBSYS_RST, 0x1);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 3ffee35..6db0db1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -322,9 +322,6 @@ struct mt7915_dev {
struct reset_control *rstc;
void __iomem *dcm;
void __iomem *sku;
-
- /* adie is inaccessible after wfsys poweron */
- u32 adie;
};

enum {
--
2.18.0

2022-02-16 07:04:05

by Macpaul Lin

Subject: Re: [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev

On 2/15/22 5:08 PM, Bo Jiao wrote:
> From: Bo Jiao <[email protected]>
>
> fix logic error and remove the unused member 'adie' of mt7915_dev.
>
> Fixes: 91eeaef2523f ("mt76: mt7915: add support for MT7986")
> Signed-off-by: Bo Jiao <[email protected]>
> ---
> - please fold this into previous commit.
> ---
> drivers/net/wireless/mediatek/mt76/mt7915/init.c | 4 ++--
> drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 ---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> index 6a4fb4c..6b3749b 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> @@ -589,10 +589,10 @@ static void mt7915_wfsys_reset(struct mt7915_dev *dev)
>
> msleep(100);
> } else if (is_mt7986(&dev->mt76)) {
> - mt7986_wmac_enable(dev);
> + mt7986_wmac_disable(dev);
> msleep(20);
>
> - mt7986_wmac_disable(dev);
> + mt7986_wmac_enable(dev);
> msleep(20);
> } else {
> mt76_set(dev, MT_WF_SUBSYS_RST, 0x1);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index 3ffee35..6db0db1 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -322,9 +322,6 @@ struct mt7915_dev {
> struct reset_control *rstc;
> void __iomem *dcm;
> void __iomem *sku;
> -
> - /* adie is inaccessible after wfsys poweron */
> - u32 adie;
> };
>
> enum {
>

Reviewed-by: Macpaul Lin <[email protected]>

Regards,
Macpaul Lin