diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/rfkill/rfkill-gpio.c | 2 | ||||
-rw-r--r-- | net/rfkill/rfkill-regulator.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 865adb61685a..78fc0937948d 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c | |||
@@ -213,7 +213,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev) | |||
213 | 213 | ||
214 | static struct platform_driver rfkill_gpio_driver = { | 214 | static struct platform_driver rfkill_gpio_driver = { |
215 | .probe = rfkill_gpio_probe, | 215 | .probe = rfkill_gpio_probe, |
216 | .remove = __devexit_p(rfkill_gpio_remove), | 216 | .remove = rfkill_gpio_remove, |
217 | .driver = { | 217 | .driver = { |
218 | .name = "rfkill_gpio", | 218 | .name = "rfkill_gpio", |
219 | .owner = THIS_MODULE, | 219 | .owner = THIS_MODULE, |
diff --git a/net/rfkill/rfkill-regulator.c b/net/rfkill/rfkill-regulator.c index 11da3018a853..4b5ab21ecb24 100644 --- a/net/rfkill/rfkill-regulator.c +++ b/net/rfkill/rfkill-regulator.c | |||
@@ -55,7 +55,7 @@ struct rfkill_ops rfkill_regulator_ops = { | |||
55 | .set_block = rfkill_regulator_set_block, | 55 | .set_block = rfkill_regulator_set_block, |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static int __devinit rfkill_regulator_probe(struct platform_device *pdev) | 58 | static int rfkill_regulator_probe(struct platform_device *pdev) |
59 | { | 59 | { |
60 | struct rfkill_regulator_platform_data *pdata = pdev->dev.platform_data; | 60 | struct rfkill_regulator_platform_data *pdata = pdev->dev.platform_data; |
61 | struct rfkill_regulator_data *rfkill_data; | 61 | struct rfkill_regulator_data *rfkill_data; |
@@ -122,7 +122,7 @@ out: | |||
122 | return ret; | 122 | return ret; |
123 | } | 123 | } |
124 | 124 | ||
125 | static int __devexit rfkill_regulator_remove(struct platform_device *pdev) | 125 | static int rfkill_regulator_remove(struct platform_device *pdev) |
126 | { | 126 | { |
127 | struct rfkill_regulator_data *rfkill_data = platform_get_drvdata(pdev); | 127 | struct rfkill_regulator_data *rfkill_data = platform_get_drvdata(pdev); |
128 | struct rfkill *rf_kill = rfkill_data->rf_kill; | 128 | struct rfkill *rf_kill = rfkill_data->rf_kill; |
@@ -137,7 +137,7 @@ static int __devexit rfkill_regulator_remove(struct platform_device *pdev) | |||
137 | 137 | ||
138 | static struct platform_driver rfkill_regulator_driver = { | 138 | static struct platform_driver rfkill_regulator_driver = { |
139 | .probe = rfkill_regulator_probe, | 139 | .probe = rfkill_regulator_probe, |
140 | .remove = __devexit_p(rfkill_regulator_remove), | 140 | .remove = rfkill_regulator_remove, |
141 | .driver = { | 141 | .driver = { |
142 | .name = "rfkill-regulator", | 142 | .name = "rfkill-regulator", |
143 | .owner = THIS_MODULE, | 143 | .owner = THIS_MODULE, |