]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: rt2x00: fix remove callback type mismatch
authorFelix Fietkau <nbd@nbd.name>
Sun, 6 Jul 2025 09:20:53 +0000 (11:20 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 7 Jul 2025 08:45:43 +0000 (10:45 +0200)
The function is used as remove callback for a platform driver.
It was missed during the conversion from int to void

Fixes: 0edb555a65d1 ("platform: Make platform_driver::remove() return void")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/20250706092053.97724-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/ralink/rt2x00/rt2x00soc.c
drivers/net/wireless/ralink/rt2x00/rt2x00soc.h

index eface610178d2e6621fa5efd2162538221559840..f7f3a2340c3929d9b08753384110240b5e575028 100644 (file)
@@ -108,7 +108,7 @@ exit_free_device:
 }
 EXPORT_SYMBOL_GPL(rt2x00soc_probe);
 
-int rt2x00soc_remove(struct platform_device *pdev)
+void rt2x00soc_remove(struct platform_device *pdev)
 {
        struct ieee80211_hw *hw = platform_get_drvdata(pdev);
        struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -119,8 +119,6 @@ int rt2x00soc_remove(struct platform_device *pdev)
        rt2x00lib_remove_dev(rt2x00dev);
        rt2x00soc_free_reg(rt2x00dev);
        ieee80211_free_hw(hw);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00soc_remove);
 
index 021fd06b362723fc22899dfa08ee71b51f167b7a..d6226b8a10e00b0abd6f80d35012882d2342725f 100644 (file)
@@ -17,7 +17,7 @@
  * SoC driver handlers.
  */
 int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops);
-int rt2x00soc_remove(struct platform_device *pdev);
+void rt2x00soc_remove(struct platform_device *pdev);
 #ifdef CONFIG_PM
 int rt2x00soc_suspend(struct platform_device *pdev, pm_message_t state);
 int rt2x00soc_resume(struct platform_device *pdev);