From 4ce4646c23373b20a156b73b398dc04aea14fce8 Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Sat, 28 Mar 2020 08:52:50 +0100 Subject: [PATCH] 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test_drivers/vimc/vimc-core.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/media/test_drivers/vimc/vimc-core.c b/drivers/media/test_drivers/vimc/vimc-core.c index 339126e..1f84988 100644 --- 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; -- 2.7.4