summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDafna Hirschfeld <dafna.hirschfeld@collabora.com>2020-03-28 08:52:50 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-14 12:01:04 +0200
commit4ce4646c23373b20a156b73b398dc04aea14fce8 (patch)
treedf0982e442d2a837e8f27a4ceacc60e0a17e9365
parent5c990fa01fb2803150c5ebd031753a884976c6d3 (diff)
downloadlinux-4ce4646c23373b20a156b73b398dc04aea14fce8.tar.gz
linux-4ce4646c23373b20a156b73b398dc04aea14fce8.zip
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>
-rw-r--r--drivers/media/test_drivers/vimc/vimc-core.c11
1 files 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 339126e565dc..1f8498837646 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;