wifi: mt76: Use PTR_ERR_OR_ZERO() to simplify code

Return PTR_ERR_OR_ZERO() instead of return 0 or PTR_ERR() to
simplify code.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 18a50ccff106a889cb8d91444904244951ac391e..f7722f67db576f9a1d7191d11c52905a155c25cc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -58,10 +58,7 @@ int mt7615_thermal_init(struct mt7615_dev *dev)
                              wiphy_name(wiphy));
        hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, name, dev,
                                                       mt7615_hwmon_groups);
-       if (IS_ERR(hwmon))
-               return PTR_ERR(hwmon);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(hwmon);
 }
 EXPORT_SYMBOL_GPL(mt7615_thermal_init);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index b27d04e02abaa5897256ddbcb08d69ed1be47b7d..8f6b213a47551abfe23af7211ce1d975927f647a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -213,10 +213,7 @@ static int mt7915_thermal_init(struct mt7915_phy *phy)
 
        hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, name, phy,
                                                       mt7915_hwmon_groups);
-       if (IS_ERR(hwmon))
-               return PTR_ERR(hwmon);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(hwmon);
 }
 
 static void mt7915_led_set_config(struct led_classdev *led_cdev,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
index 37348b208736e7c8a0e4cee2f8c8cb944f128111..06e3d9db996c14198f98201f24bdf1974c5b7b32 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
@@ -1219,10 +1219,7 @@ static int mt798x_wmac_init(struct mt7915_dev *dev)
                return PTR_ERR(dev->sku);
 
        dev->rstc = devm_reset_control_get(pdev, "consys");
-       if (IS_ERR(dev->rstc))
-               return PTR_ERR(dev->rstc);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(dev->rstc);
 }
 
 static int mt798x_wmac_probe(struct platform_device *pdev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index ff63f37f67d9c99b87c3fb09c1f8d59d7c5f1816..534c7bee5ef1a407f0a1709938a12339f5077c99 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -55,10 +55,7 @@ static int mt7921_thermal_init(struct mt792x_phy *phy)
 
        hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, name, phy,
                                                       mt7921_hwmon_groups);
-       if (IS_ERR(hwmon))
-               return PTR_ERR(hwmon);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(hwmon);
 }
 
 static void