From 98ee3e2889ea50c56be8daa2748666c92d95e363 Mon Sep 17 00:00:00 2001 From: Bo Jiao Date: Tue, 15 Feb 2022 17:08:27 +0800 Subject: [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev 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 Signed-off-by: Felix Fietkau --- mt7915/init.c | 4 ++-- mt7915/mt7915.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mt7915/init.c b/mt7915/init.c index 6a4fb4cf..6b3749ba 100644 --- a/mt7915/init.c +++ b/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/mt7915/mt7915.h b/mt7915/mt7915.h index 3ffee353..6db0db11 100644 --- a/mt7915/mt7915.h +++ b/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 {