media: staging: media: tegra-video: Convert to platform remove callback returning...

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 the three tegra-video drivers 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: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index 9aa72863c213e3bcfdd440ccf211ae3639bfbad7..0d94115b9bbbd7e9c2e65d74b2085b270975a3c1 100644 (file)
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -818,15 +818,13 @@ rpm_disable:
        return ret;
 }
 
-static int tegra_csi_remove(struct platform_device *pdev)
+static void tegra_csi_remove(struct platform_device *pdev)
 {
        struct tegra_csi *csi = platform_get_drvdata(pdev);
 
        host1x_client_unregister(&csi->client);
 
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 #if defined(CONFIG_ARCH_TEGRA_210_SOC)
@@ -852,5 +850,5 @@ struct platform_driver tegra_csi_driver = {
                .pm             = &tegra_csi_pm_ops,
        },
        .probe                  = tegra_csi_probe,
-       .remove                 = tegra_csi_remove,
+       .remove_new             = tegra_csi_remove,
 };

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index 94171e62dee9e4a5acb8ce17c35bad712f8dd268..61169ff13ec5c9045f9dcdd0acf9150e8d0cee51 100644 (file)
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1944,7 +1944,7 @@ rpm_disable:
        return ret;
 }
 
-static int tegra_vi_remove(struct platform_device *pdev)
+static void tegra_vi_remove(struct platform_device *pdev)
 {
        struct tegra_vi *vi = platform_get_drvdata(pdev);
 
@@ -1953,8 +1953,6 @@ static int tegra_vi_remove(struct platform_device *pdev)
        if (vi->ops->vi_enable)
                vi->ops->vi_enable(vi, false);
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 static const struct of_device_id tegra_vi_of_id_table[] = {
@@ -1979,5 +1977,5 @@ struct platform_driver tegra_vi_driver = {
                .pm = &tegra_vi_pm_ops,
        },
        .probe = tegra_vi_probe,
-       .remove = tegra_vi_remove,
+       .remove_new = tegra_vi_remove,
 };

diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c
index e95cc7bb190e1f76987584308a007bd59050134b..8504b9ea9cea2ce27164c689116663a820608706 100644 (file)
--- a/drivers/staging/media/tegra-video/vip.c
+++ b/drivers/staging/media/tegra-video/vip.c
@@ -254,15 +254,13 @@ static int tegra_vip_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tegra_vip_remove(struct platform_device *pdev)
+static void tegra_vip_remove(struct platform_device *pdev)
 {
        struct tegra_vip *vip = platform_get_drvdata(pdev);
 
        host1x_client_unregister(&vip->client);
 
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 #if defined(CONFIG_ARCH_TEGRA_2x_SOC)
@@ -283,5 +281,5 @@ struct platform_driver tegra_vip_driver = {
                .of_match_table = tegra_vip_of_id_table,
        },
        .probe                  = tegra_vip_probe,
-       .remove                 = tegra_vip_remove,
+       .remove_new             = tegra_vip_remove,
 };