Skip to content

Commit 70edec6

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: mdio: mux-mmioreg: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent a2879f7 commit 70edec6

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/net/mdio/mdio-mux-mmioreg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,11 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev)
169169
return 0;
170170
}
171171

172-
static int mdio_mux_mmioreg_remove(struct platform_device *pdev)
172+
static void mdio_mux_mmioreg_remove(struct platform_device *pdev)
173173
{
174174
struct mdio_mux_mmioreg_state *s = dev_get_platdata(&pdev->dev);
175175

176176
mdio_mux_uninit(s->mux_handle);
177-
178-
return 0;
179177
}
180178

181179
static const struct of_device_id mdio_mux_mmioreg_match[] = {
@@ -192,7 +190,7 @@ static struct platform_driver mdio_mux_mmioreg_driver = {
192190
.of_match_table = mdio_mux_mmioreg_match,
193191
},
194192
.probe = mdio_mux_mmioreg_probe,
195-
.remove = mdio_mux_mmioreg_remove,
193+
.remove_new = mdio_mux_mmioreg_remove,
196194
};
197195

198196
module_platform_driver(mdio_mux_mmioreg_driver);

0 commit comments

Comments
 (0)