Skip to content

Commit

Permalink
soc/xilinx: zynqmp_power: Convert to platform remove callback returni…
Browse files Browse the repository at this point in the history
…ng 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() will be 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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Michal Simek <[email protected]>
  • Loading branch information
Uwe Kleine-König authored and michalsimek committed Nov 15, 2023
1 parent b85ea95 commit f1013d8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/soc/xilinx/zynqmp_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,16 +275,14 @@ static int zynqmp_pm_probe(struct platform_device *pdev)
return 0;
}

static int zynqmp_pm_remove(struct platform_device *pdev)
static void zynqmp_pm_remove(struct platform_device *pdev)
{
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_suspend_mode.attr);
if (event_registered)
xlnx_unregister_event(PM_INIT_SUSPEND_CB, 0, 0, suspend_event_callback, NULL);

if (!rx_chan)
mbox_free_channel(rx_chan);

return 0;
}

static const struct of_device_id pm_of_match[] = {
Expand All @@ -295,7 +293,7 @@ MODULE_DEVICE_TABLE(of, pm_of_match);

static struct platform_driver zynqmp_pm_platform_driver = {
.probe = zynqmp_pm_probe,
.remove = zynqmp_pm_remove,
.remove_new = zynqmp_pm_remove,
.driver = {
.name = "zynqmp_power",
.of_match_table = pm_of_match,
Expand Down

0 comments on commit f1013d8

Please sign in to comment.