wifi: mt76: mt7915: add error message in mt7915_thermal_set_cur_throttle_state()

[ Upstream commit 2f2d86309e228adfe658c9c0a23c726d8b3ce475 ]

Add dev_err so that it is easier to see invalid setting while looking at
dmesg.

Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Stable-dep-of: 9c97df11dfe6 ("wifi: mt76: mt7915: rework init flow in mt7915_thermal_init()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 916d6c7c569d3ffbd57f159451bd67cc7a0b6d54..db0a35974ca7e70bc5700166793056afed6ca77f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -146,8 +146,11 @@ mt7915_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,
        u8 throttling = MT7915_THERMAL_THROTTLE_MAX - state;
        int ret;
 
-       if (state > MT7915_CDEV_THROTTLE_MAX)
+       if (state > MT7915_CDEV_THROTTLE_MAX) {
+               dev_err(phy->dev->mt76.dev,
+                       "please specify a valid throttling state\n");
                return -EINVAL;
+       }
 
        if (state == phy->cdev_state)
                return 0;
@@ -176,7 +179,7 @@ static void mt7915_unregister_thermal(struct mt7915_phy *phy)
        struct wiphy *wiphy = phy->mt76->hw->wiphy;
 
        if (!phy->cdev)
-           return;
+               return;
 
        sysfs_remove_link(&wiphy->dev.kobj, "cooling_device");
        thermal_cooling_device_unregister(phy->cdev);
@@ -210,8 +213,8 @@ static int mt7915_thermal_init(struct mt7915_phy *phy)
                return PTR_ERR(hwmon);
 
        /* initialize critical/maximum high temperature */
-       phy->throttle_temp[MT7915_CRIT_TEMP_IDX] = 110;
-       phy->throttle_temp[MT7915_MAX_TEMP_IDX] = 120;
+       phy->throttle_temp[MT7915_CRIT_TEMP_IDX] = MT7915_CRIT_TEMP;
+       phy->throttle_temp[MT7915_MAX_TEMP_IDX] = MT7915_MAX_TEMP;
 
        return 0;
 }
@@ -1112,7 +1115,6 @@ static void mt7915_stop_hardware(struct mt7915_dev *dev)
                mt7986_wmac_disable(dev);
 }
 
-
 int mt7915_register_device(struct mt7915_dev *dev)
 {
        struct ieee80211_hw *hw = mt76_hw(dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index e58650bbbd14a4faac152b84a7175fac10b278bc..942d70c538254384d7106475f086cecf8b848c0b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -72,6 +72,8 @@
 
 #define MT7915_CRIT_TEMP_IDX           0
 #define MT7915_MAX_TEMP_IDX            1
+#define MT7915_CRIT_TEMP               110
+#define MT7915_MAX_TEMP                        120
 
 struct mt7915_vif;
 struct mt7915_sta;