Skip to content

Commit 2ce6ad9

Browse files
nbd168jmberg-intel
authored andcommitted
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: 0edb555 ("platform: Make platform_driver::remove() return void") Signed-off-by: Felix Fietkau <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 58fcb1b commit 2ce6ad9

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

drivers/net/wireless/ralink/rt2x00/rt2x00soc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops)
108108
}
109109
EXPORT_SYMBOL_GPL(rt2x00soc_probe);
110110

111-
int rt2x00soc_remove(struct platform_device *pdev)
111+
void rt2x00soc_remove(struct platform_device *pdev)
112112
{
113113
struct ieee80211_hw *hw = platform_get_drvdata(pdev);
114114
struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -119,8 +119,6 @@ int rt2x00soc_remove(struct platform_device *pdev)
119119
rt2x00lib_remove_dev(rt2x00dev);
120120
rt2x00soc_free_reg(rt2x00dev);
121121
ieee80211_free_hw(hw);
122-
123-
return 0;
124122
}
125123
EXPORT_SYMBOL_GPL(rt2x00soc_remove);
126124

drivers/net/wireless/ralink/rt2x00/rt2x00soc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* SoC driver handlers.
1818
*/
1919
int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops);
20-
int rt2x00soc_remove(struct platform_device *pdev);
20+
void rt2x00soc_remove(struct platform_device *pdev);
2121
#ifdef CONFIG_PM
2222
int rt2x00soc_suspend(struct platform_device *pdev, pm_message_t state);
2323
int rt2x00soc_resume(struct platform_device *pdev);

0 commit comments

Comments
 (0)