diff options
| author | David S. Miller <davem@davemloft.net> | 2023-09-20 10:25:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-20 10:25:58 +0100 |
| commit | ad1e15dd2bb084a85b287fd1cedea42f642e3e47 (patch) | |
| tree | e2e60323afec5d45e2e7a433987465b44ea916f7 /drivers/net/dsa/hirschmann/hellcreek.c | |
| parent | 6f0b985d3545e1b1fe58318ef09808ae7aa0c470 (diff) | |
| parent | ce322d45683f1b0f4cc86ff684eb469eb165b9e9 (diff) | |
Merge branch 'dsa-platform-remove-void'
Uwe Kleine-König says:
====================
net: dsa: Convert to platform remove callback returning void
this series converts all platform drivers below drivers/net/dsa 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 or a subject prefix is suboptimal, please apply the remainder of
this series anyhow.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/hirschmann/hellcreek.c')
| -rw-r--r-- | drivers/net/dsa/hirschmann/hellcreek.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index 11ef1d7ea229..beda1e9d350f 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -2060,18 +2060,16 @@ err_ptp_setup: return ret; } -static int hellcreek_remove(struct platform_device *pdev) +static void hellcreek_remove(struct platform_device *pdev) { struct hellcreek *hellcreek = platform_get_drvdata(pdev); if (!hellcreek) - return 0; + return; hellcreek_hwtstamp_free(hellcreek); hellcreek_ptp_free(hellcreek); dsa_unregister_switch(hellcreek->ds); - - return 0; } static void hellcreek_shutdown(struct platform_device *pdev) @@ -2107,7 +2105,7 @@ MODULE_DEVICE_TABLE(of, hellcreek_of_match); static struct platform_driver hellcreek_driver = { .probe = hellcreek_probe, - .remove = hellcreek_remove, + .remove_new = hellcreek_remove, .shutdown = hellcreek_shutdown, .driver = { .name = "hellcreek", |