media: vimc: remove the function vimc_unregister

The function vimc_unregister is called only from
one place in the code and has only 3 lines so it
has no justification.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/test_drivers/vimc/vimc-core.c b/drivers/media/test_drivers/vimc/vimc-core.c
index 339126e..1f84988 100644 (file)
--- a/drivers/media/test_drivers/vimc/vimc-core.c
+++ b/drivers/media/test_drivers/vimc/vimc-core.c
@@ -268,13 +268,6 @@ err_v4l2_unregister:
        return ret;
 }
 
-static void vimc_unregister(struct vimc_device *vimc)
-{
-       vimc_unregister_subdevs(vimc);
-       media_device_unregister(&vimc->mdev);
-       v4l2_device_unregister(&vimc->v4l2_dev);
-}
-
 static int vimc_probe(struct platform_device *pdev)
 {
        struct vimc_device *vimc;
@@ -321,7 +314,9 @@ static int vimc_remove(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "remove");
 
-       vimc_unregister(vimc);
+       vimc_unregister_subdevs(vimc);
+       media_device_unregister(&vimc->mdev);
+       v4l2_device_unregister(&vimc->v4l2_dev);
        v4l2_device_put(&vimc->v4l2_dev);
 
        return 0;