diff options
| author | Felix Fietkau | 2025-07-06 09:22:33 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-07-06 09:22:41 +0000 |
| commit | e1d39bdbdb0fabbe6adb32f1ce69797ce4248dc4 (patch) | |
| tree | 11b24765d0d266dfb1b689c8b0e38d1fad802a48 | |
| parent | 5adc663af6c9669493d4fe9bf8169d6debe7aab8 (diff) | |
| download | openwrt-e1d39bdbdb0fabbe6adb32f1ce69797ce4248dc4.tar.gz | |
mac80211: fix rt2x00 build error on 6.12
Fix missing remove callback type signature conversion
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/kernel/mac80211/patches/rt2x00/110-wifi-rt2x00-fix-remove-callback-type-mismatch.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/110-wifi-rt2x00-fix-remove-callback-type-mismatch.patch b/package/kernel/mac80211/patches/rt2x00/110-wifi-rt2x00-fix-remove-callback-type-mismatch.patch new file mode 100644 index 0000000000..0c9bb76cb5 --- /dev/null +++ b/package/kernel/mac80211/patches/rt2x00/110-wifi-rt2x00-fix-remove-callback-type-mismatch.patch @@ -0,0 +1,42 @@ +From: Felix Fietkau <nbd@nbd.name> +Date: Sun, 6 Jul 2025 11:15:13 +0200 +Subject: [PATCH] wifi: rt2x00: fix remove callback type mismatch + +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> +--- + +--- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c ++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c +@@ -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_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); |