diff options
| author | David S. Miller <davem@davemloft.net> | 2023-09-20 10:29:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-20 10:29:35 +0100 |
| commit | a76c22e22cb7aecc22051f0bfe36eb50189738fe (patch) | |
| tree | da1523adda2d2244febf0083d0d99229a8dfd81d /drivers/net/mdio/mdio-mux-multiplexer.c | |
| parent | ad1e15dd2bb084a85b287fd1cedea42f642e3e47 (diff) | |
| parent | 032ca4f9e782153aef1dccef6d7f7c75c6f77fd3 (diff) | |
Merge branch 'mdio-platform-remove-void'
Uwe Kleine-König says:
====================
net: mdio: Convert to platform remove callback returning void
this series convert all platform drivers below drivers/net/mdio to
use remove_new. The motivation is to get rid of an integer return code
that is (mostly) ignored by the platform driver core and error prone on
the driver side.
See commit 5c5a7680e67b ("platform: Provide a remove callback that
returns no value") for an extended explanation and the eventual goal.
There are no interdependencies between the patches. As there are still
quite a few drivers to convert, I'm happy about every patch that makes
it in. So even if there is a merge conflict with one patch until you
apply, please apply the remainder of this series anyhow.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mdio/mdio-mux-multiplexer.c')
| -rw-r--r-- | drivers/net/mdio/mdio-mux-multiplexer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/mdio/mdio-mux-multiplexer.c b/drivers/net/mdio/mdio-mux-multiplexer.c index bfa5af577b0a..569b13383191 100644 --- a/drivers/net/mdio/mdio-mux-multiplexer.c +++ b/drivers/net/mdio/mdio-mux-multiplexer.c @@ -85,7 +85,7 @@ static int mdio_mux_multiplexer_probe(struct platform_device *pdev) return ret; } -static int mdio_mux_multiplexer_remove(struct platform_device *pdev) +static void mdio_mux_multiplexer_remove(struct platform_device *pdev) { struct mdio_mux_multiplexer_state *s = platform_get_drvdata(pdev); @@ -93,8 +93,6 @@ static int mdio_mux_multiplexer_remove(struct platform_device *pdev) if (s->do_deselect) mux_control_deselect(s->muxc); - - return 0; } static const struct of_device_id mdio_mux_multiplexer_match[] = { @@ -109,7 +107,7 @@ static struct platform_driver mdio_mux_multiplexer_driver = { .of_match_table = mdio_mux_multiplexer_match, }, .probe = mdio_mux_multiplexer_probe, - .remove = mdio_mux_multiplexer_remove, + .remove_new = mdio_mux_multiplexer_remove, }; module_platform_driver(mdio_mux_multiplexer_driver); |