Skip to content

Commit 408201e

Browse files
Uwe Kleine-Königgregkh
authored andcommitted
firmware: zynqmp: 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() 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 <u.kleine-koenig@pengutronix.de> Reviewed-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/b5a82472a6d61608c2cd7728ca364f6c88a821c3.1703693980.git.u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 31fd8f1 commit 408201e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/firmware/xilinx/zynqmp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,7 +1929,7 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
19291929
return of_platform_populate(dev->of_node, NULL, NULL, dev);
19301930
}
19311931

1932-
static int zynqmp_firmware_remove(struct platform_device *pdev)
1932+
static void zynqmp_firmware_remove(struct platform_device *pdev)
19331933
{
19341934
struct pm_api_feature_data *feature_data;
19351935
struct hlist_node *tmp;
@@ -1944,8 +1944,6 @@ static int zynqmp_firmware_remove(struct platform_device *pdev)
19441944
}
19451945

19461946
platform_device_unregister(em_dev);
1947-
1948-
return 0;
19491947
}
19501948

19511949
static const struct of_device_id zynqmp_firmware_of_match[] = {
@@ -1962,6 +1960,6 @@ static struct platform_driver zynqmp_firmware_driver = {
19621960
.dev_groups = zynqmp_firmware_groups,
19631961
},
19641962
.probe = zynqmp_firmware_probe,
1965-
.remove = zynqmp_firmware_remove,
1963+
.remove_new = zynqmp_firmware_remove,
19661964
};
19671965
module_platform_driver(zynqmp_firmware_driver);

0 commit comments

Comments
 (0)