[PATCH 11/11] firmware: zynqmp: Convert to platform remove callback returning void

Michal Simek michal.simek at amd.com
Tue Jan 2 02:00:55 PST 2024



On 12/27/23 17:26, Uwe Kleine-König wrote:
> 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 at pengutronix.de>
> ---
>   drivers/firmware/xilinx/zynqmp.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index a55dfd9bae6b..73cae6ef83ec 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -1929,7 +1929,7 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
>   	return of_platform_populate(dev->of_node, NULL, NULL, dev);
>   }
>   
> -static int zynqmp_firmware_remove(struct platform_device *pdev)
> +static void zynqmp_firmware_remove(struct platform_device *pdev)
>   {
>   	struct pm_api_feature_data *feature_data;
>   	struct hlist_node *tmp;
> @@ -1944,8 +1944,6 @@ static int zynqmp_firmware_remove(struct platform_device *pdev)
>   	}
>   
>   	platform_device_unregister(em_dev);
> -
> -	return 0;
>   }
>   
>   static const struct of_device_id zynqmp_firmware_of_match[] = {
> @@ -1962,6 +1960,6 @@ static struct platform_driver zynqmp_firmware_driver = {
>   		.dev_groups = zynqmp_firmware_groups,
>   	},
>   	.probe = zynqmp_firmware_probe,
> -	.remove = zynqmp_firmware_remove,
> +	.remove_new = zynqmp_firmware_remove,
>   };
>   module_platform_driver(zynqmp_firmware_driver);

Reviewed-by: Michal Simek <michal.simek at amd.com>

Thanks,
Michal



More information about the linux-arm-kernel mailing list