linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mt76: mt7915: fix compiler warning
@ 2022-02-15  9:08 Bo Jiao
  2022-02-15  9:08 ` [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev Bo Jiao
  2022-02-16  2:50 ` [PATCH] mt76: mt7915: fix compiler warning Macpaul Lin
  0 siblings, 2 replies; 4+ messages in thread
From: Bo Jiao @ 2022-02-15  9:08 UTC (permalink / raw)
  To: Felix Fietkau
  Cc: linux-wireless, Ryder Lee, Xing Song, Sujuan Chen, Shayne Chen,
	Evelyn Tsai, linux-mediatek, Bo Jiao

From: Bo Jiao <Bo.Jiao@mediatek.com>

fix warning: variable 'temp' set but not used and
cast from pointer to integer of different size

Fixes: 91eeaef2523f ("mt76: mt7915: add support for MT7986")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
 - please fold this into previous commit.
---
 drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
index fb72ab4..decf288 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
@@ -125,7 +125,7 @@ mt7986_wmac_adie_efuse_read(struct mt7915_dev *dev, u8 adie,
 		return ret;
 
 	ret = read_poll_timeout(mt76_wmac_spi_read, temp,
-				!FIELD_GET(MT_ADIE_EFUSE_KICK_MASK, val),
+				!temp && !FIELD_GET(MT_ADIE_EFUSE_KICK_MASK, val),
 				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,
 				dev, adie, MT_ADIE_EFUSE2_CTRL, &val);
 	if (ret)
@@ -1126,9 +1126,9 @@ static int mt7986_wmac_probe(struct platform_device *pdev)
 	struct mt7915_dev *dev;
 	struct mt76_dev *mdev;
 	int irq, ret;
-	u64 chip_id;
+	u32 chip_id;
 
-	chip_id = (u64)of_device_get_match_data(&pdev->dev);
+	chip_id = (uintptr_t)of_device_get_match_data(&pdev->dev);
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev
  2022-02-15  9:08 [PATCH] mt76: mt7915: fix compiler warning Bo Jiao
@ 2022-02-15  9:08 ` Bo Jiao
  2022-02-16  2:50   ` Macpaul Lin
  2022-02-16  2:50 ` [PATCH] mt76: mt7915: fix compiler warning Macpaul Lin
  1 sibling, 1 reply; 4+ messages in thread
From: Bo Jiao @ 2022-02-15  9:08 UTC (permalink / raw)
  To: Felix Fietkau
  Cc: linux-wireless, Ryder Lee, Xing Song, Sujuan Chen, Shayne Chen,
	Evelyn Tsai, linux-mediatek, Bo Jiao

From: Bo Jiao <Bo.Jiao@mediatek.com>

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 <Bo.Jiao@mediatek.com>
---
 - 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev
  2022-02-15  9:08 ` [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev Bo Jiao
@ 2022-02-16  2:50   ` Macpaul Lin
  0 siblings, 0 replies; 4+ messages in thread
From: Macpaul Lin @ 2022-02-16  2:50 UTC (permalink / raw)
  To: Bo Jiao, Felix Fietkau
  Cc: linux-wireless, Ryder Lee, Xing Song, Sujuan Chen, Shayne Chen,
	Evelyn Tsai, linux-mediatek

On 2/15/22 5:08 PM, Bo Jiao wrote:
> From: Bo Jiao <Bo.Jiao@mediatek.com>
> 
> 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 <Bo.Jiao@mediatek.com>
> ---
>   - 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 <macpaul.lin@mediatek.com>

Regards,
Macpaul Lin

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] mt76: mt7915: fix compiler warning
  2022-02-15  9:08 [PATCH] mt76: mt7915: fix compiler warning Bo Jiao
  2022-02-15  9:08 ` [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev Bo Jiao
@ 2022-02-16  2:50 ` Macpaul Lin
  1 sibling, 0 replies; 4+ messages in thread
From: Macpaul Lin @ 2022-02-16  2:50 UTC (permalink / raw)
  To: Bo Jiao, Felix Fietkau
  Cc: linux-wireless, Ryder Lee, Xing Song, Sujuan Chen, Shayne Chen,
	Evelyn Tsai, linux-mediatek

On 2/15/22 5:08 PM, Bo Jiao wrote:
> From: Bo Jiao <Bo.Jiao@mediatek.com>
> 
> fix warning: variable 'temp' set but not used and
> cast from pointer to integer of different size
> 
> Fixes: 91eeaef2523f ("mt76: mt7915: add support for MT7986")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> ---
>   - please fold this into previous commit.
> ---
>   drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
> index fb72ab4..decf288 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
> @@ -125,7 +125,7 @@ mt7986_wmac_adie_efuse_read(struct mt7915_dev *dev, u8 adie,
>   		return ret;
>   
>   	ret = read_poll_timeout(mt76_wmac_spi_read, temp,
> -				!FIELD_GET(MT_ADIE_EFUSE_KICK_MASK, val),
> +				!temp && !FIELD_GET(MT_ADIE_EFUSE_KICK_MASK, val),
>   				USEC_PER_MSEC, 50 * USEC_PER_MSEC, false,
>   				dev, adie, MT_ADIE_EFUSE2_CTRL, &val);
>   	if (ret)
> @@ -1126,9 +1126,9 @@ static int mt7986_wmac_probe(struct platform_device *pdev)
>   	struct mt7915_dev *dev;
>   	struct mt76_dev *mdev;
>   	int irq, ret;
> -	u64 chip_id;
> +	u32 chip_id;
>   
> -	chip_id = (u64)of_device_get_match_data(&pdev->dev);
> +	chip_id = (uintptr_t)of_device_get_match_data(&pdev->dev);
>   
>   	irq = platform_get_irq(pdev, 0);
>   	if (irq < 0)
> 

Reviewed-by: Macpaul Lin <macpaul.lin@mediatek.com>

Regards,
Macpaul Lin

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-16  2:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-15  9:08 [PATCH] mt76: mt7915: fix compiler warning Bo Jiao
2022-02-15  9:08 ` [PATCH] mt76: mt7915: fix logic error and remove the unused member of mt7915_dev Bo Jiao
2022-02-16  2:50   ` Macpaul Lin
2022-02-16  2:50 ` [PATCH] mt76: mt7915: fix compiler warning Macpaul Lin

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).