History

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.

Uwe Kleine-König committed 2 years ago

Commit 408201e1 parent 31fd8f11 file · +2 −4Browse files

Unified · Split

drivers/firmware/xilinx/zynqmp.c+2−4
@@ -1929,7 +1929,7 @@ static int zynqmp_firmware_probe(struct platform_device *pdev) · 1928 unmodified lines
1929 return of_platform_populate(dev->of_node, NULL, NULL, dev);1929 return of_platform_populate(dev->of_node, NULL, NULL, dev);
1930}1930}
1931 1931
1932static int zynqmp_firmware_remove(struct platform_device *pdev)1932static void zynqmp_firmware_remove(struct platform_device *pdev)
1933{1933{
1934 struct pm_api_feature_data *feature_data;1934 struct pm_api_feature_data *feature_data;
1935 struct hlist_node *tmp;1935 struct hlist_node *tmp;
@@ -1944,8 +1944,6 @@ static int zynqmp_firmware_remove(struct platform_device *pdev) · 8 unmodified lines
1944 }1944 }
1945 1945
1946 platform_device_unregister(em_dev);1946 platform_device_unregister(em_dev);
1947
1948 return 0;
1949}1947}
1950 1948
1951static const struct of_device_id zynqmp_firmware_of_match[] = {1949static const struct of_device_id zynqmp_firmware_of_match[] = {
@@ -1962,6 +1960,6 @@ static struct platform_driver zynqmp_firmware_driver = { · 10 unmodified lines
1962 .dev_groups = zynqmp_firmware_groups,1960 .dev_groups = zynqmp_firmware_groups,
1963 },1961 },
1964 .probe = zynqmp_firmware_probe,1962 .probe = zynqmp_firmware_probe,
1965 .remove = zynqmp_firmware_remove,1963 .remove_new = zynqmp_firmware_remove,
1966};1964};
1967module_platform_driver(zynqmp_firmware_driver);1965module_platform_driver(zynqmp_firmware_driver);