diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-03 09:32:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-03 09:32:25 +0200 |
| commit | de80193308f43d3ae52cd3561e8ba77cd1437311 (patch) | |
| tree | 3960ff42c407370dfd8c114e5b828bdece9cf425 /drivers/usb/cdns3/cdns3-starfive.c | |
| parent | 54aee5f15b83437f23b2b2469bcf21bdd9823916 (diff) | |
| parent | 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa (diff) | |
Merge tag 'v6.6-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/cdns3/cdns3-starfive.c')
| -rw-r--r-- | drivers/usb/cdns3/cdns3-starfive.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/cdns3/cdns3-starfive.c b/drivers/usb/cdns3/cdns3-starfive.c index fc1f003b145d..a7265b86e427 100644 --- a/drivers/usb/cdns3/cdns3-starfive.c +++ b/drivers/usb/cdns3/cdns3-starfive.c @@ -166,7 +166,7 @@ static int cdns_starfive_remove_core(struct device *dev, void *c) return 0; } -static int cdns_starfive_remove(struct platform_device *pdev) +static void cdns_starfive_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct cdns_starfive *data = dev_get_drvdata(dev); @@ -178,8 +178,6 @@ static int cdns_starfive_remove(struct platform_device *pdev) pm_runtime_put_noidle(dev); cdns_clk_rst_deinit(data); platform_set_drvdata(pdev, NULL); - - return 0; } #ifdef CONFIG_PM @@ -232,7 +230,7 @@ MODULE_DEVICE_TABLE(of, cdns_starfive_of_match); static struct platform_driver cdns_starfive_driver = { .probe = cdns_starfive_probe, - .remove = cdns_starfive_remove, + .remove_new = cdns_starfive_remove, .driver = { .name = "cdns3-starfive", .of_match_table = cdns_starfive_of_match, |