On Fri, Mar 08, 2024 at 09:51:20AM +0100, 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-koe...@pengutronix.de>

Acked-by: Michael S. Tsirkin <m...@redhat.com>

do u want me to merge this?

> ---
>  drivers/virtio/virtio_mmio.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index 59892a31cf76..173596589c71 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -696,12 +696,10 @@ static int virtio_mmio_probe(struct platform_device 
> *pdev)
>       return rc;
>  }
>  
> -static int virtio_mmio_remove(struct platform_device *pdev)
> +static void virtio_mmio_remove(struct platform_device *pdev)
>  {
>       struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev);
>       unregister_virtio_device(&vm_dev->vdev);
> -
> -     return 0;
>  }
>  
>  
> @@ -847,7 +845,7 @@ MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);
>  
>  static struct platform_driver virtio_mmio_driver = {
>       .probe          = virtio_mmio_probe,
> -     .remove         = virtio_mmio_remove,
> +     .remove_new     = virtio_mmio_remove,
>       .driver         = {
>               .name   = "virtio-mmio",
>               .of_match_table = virtio_mmio_match,
> 
> base-commit: 8ffc8b1bbd505e27e2c8439d326b6059c906c9dd
> -- 
> 2.43.0


Reply via email to