OSDN Git Service

wifi: mt76: mt7915: add error message in mt7915_thermal_set_cur_throttle_state()
authorHoward Hsu <howard-yh.hsu@mediatek.com>
Wed, 14 Dec 2022 02:28:09 +0000 (10:28 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 3 Feb 2023 13:47:15 +0000 (14:47 +0100)
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>
drivers/net/wireless/mediatek/mt76/mt7915/init.c
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h

index 0ab9e13..a89b37a 100644 (file)
@@ -145,8 +145,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;
@@ -175,7 +178,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);
@@ -209,8 +212,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;
 }
@@ -1182,7 +1185,6 @@ static void mt7915_stop_hardware(struct mt7915_dev *dev)
                mt7986_wmac_disable(dev);
 }
 
-
 int mt7915_register_device(struct mt7915_dev *dev)
 {
        struct mt7915_phy *phy2;
index e58650b..942d70c 100644 (file)
@@ -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;