forked from Openwrt-EcoNet/openwrt
6b0f414aff
Easy compability fix for kernel 6.12. Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/18719 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
|
|
@@ -273,7 +273,7 @@ static struct platform_driver rt2800soc_
|
|
.of_match_table = rt2880_wmac_match,
|
|
},
|
|
.probe = rt2800soc_probe,
|
|
- .remove = rt2x00soc_remove,
|
|
+ .remove_new = rt2x00soc_remove,
|
|
.suspend = rt2x00soc_suspend,
|
|
.resume = rt2x00soc_resume,
|
|
};
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c
|
|
@@ -124,7 +124,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;
|
|
@@ -135,8 +135,6 @@ int rt2x00soc_remove(struct platform_dev
|
|
rt2x00lib_remove_dev(rt2x00dev);
|
|
rt2x00soc_free_reg(rt2x00dev);
|
|
ieee80211_free_hw(hw);
|
|
-
|
|
- return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2x00soc_remove);
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
|
|
@@ -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);
|