From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: linux-media@vger.kernel.org
Cc: dafna.hirschfeld@collabora.com, helen.koike@collabora.com,
ezequiel@collabora.com, andre.almeida@collabora.com,
skhan@linuxfoundation.org, hverkuil@xs4all.nl,
kernel@collabora.com, dafna3@gmail.com
Subject: [PATCH v2 5/5] media: vimc: remove the helper function vimc_ent_sd_unregister
Date: Thu, 3 Oct 2019 12:44:09 +0200 [thread overview]
Message-ID: <20191003104409.15756-6-dafna.hirschfeld@collabora.com> (raw)
In-Reply-To: <20191003104409.15756-1-dafna.hirschfeld@collabora.com>
since this function only calls v4l2_device_unregister_subdev,
it is pointless.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/media/platform/vimc/vimc-common.c | 5 -----
drivers/media/platform/vimc/vimc-common.h | 12 ------------
drivers/media/platform/vimc/vimc-debayer.c | 2 +-
drivers/media/platform/vimc/vimc-scaler.c | 2 +-
drivers/media/platform/vimc/vimc-sensor.c | 2 +-
5 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c
index 999bc353fb10..67b53dc1849d 100644
--- a/drivers/media/platform/vimc/vimc-common.c
+++ b/drivers/media/platform/vimc/vimc-common.c
@@ -421,8 +421,3 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,
}
EXPORT_SYMBOL_GPL(vimc_ent_sd_register);
-void vimc_ent_sd_unregister(struct vimc_ent_device *ved, struct v4l2_subdev *sd)
-{
- v4l2_device_unregister_subdev(sd);
-}
-EXPORT_SYMBOL_GPL(vimc_ent_sd_unregister);
diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h
index 698db7c07645..af5b1166dc1f 100644
--- a/drivers/media/platform/vimc/vimc-common.h
+++ b/drivers/media/platform/vimc/vimc-common.h
@@ -251,18 +251,6 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,
const struct v4l2_subdev_internal_ops *sd_int_ops,
const struct v4l2_subdev_ops *sd_ops);
-/**
- * vimc_ent_sd_unregister - cleanup and unregister a subdev node
- *
- * @ved: the vimc_ent_device struct to be cleaned up
- * @sd: the v4l2_subdev struct to be unregistered
- *
- * Helper function cleanup and unregister the struct vimc_ent_device and struct
- * v4l2_subdev which represents a subdev node in the topology
- */
-void vimc_ent_sd_unregister(struct vimc_ent_device *ved,
- struct v4l2_subdev *sd);
-
/**
* vimc_link_validate - validates a media link
*
diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c
index e1bad6713cde..4e5316c671e0 100644
--- a/drivers/media/platform/vimc/vimc-debayer.c
+++ b/drivers/media/platform/vimc/vimc-debayer.c
@@ -491,7 +491,7 @@ void vimc_deb_rm(struct vimc_device *vimc, struct vimc_ent_device *ved)
struct vimc_deb_device *vdeb;
vdeb = container_of(ved, struct vimc_deb_device, ved);
- vimc_ent_sd_unregister(ved, &vdeb->sd);
+ v4l2_device_unregister_subdev(&vdeb->sd);
}
struct vimc_ent_device *vimc_deb_add(struct vimc_device *vimc,
diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
index 1982bc089af5..4fe2ba578652 100644
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -350,7 +350,7 @@ void vimc_sca_rm(struct vimc_device *vimc, struct vimc_ent_device *ved)
struct vimc_sca_device *vsca;
vsca = container_of(ved, struct vimc_sca_device, ved);
- vimc_ent_sd_unregister(ved, &vsca->sd);
+ v4l2_device_unregister_subdev(&vsca->sd);
}
struct vimc_ent_device *vimc_sca_add(struct vimc_device *vimc,
diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c
index 63fe024ccea5..14838362d871 100644
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -305,7 +305,7 @@ void vimc_sen_rm(struct vimc_device *vimc, struct vimc_ent_device *ved)
struct vimc_sen_device *vsen;
vsen = container_of(ved, struct vimc_sen_device, ved);
- vimc_ent_sd_unregister(ved, &vsen->sd);
+ v4l2_device_unregister_subdev(&vsen->sd);
}
/* Image Processing Controls */
--
2.20.1
next prev parent reply other threads:[~2019-10-03 10:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 10:44 [PATCH v2 0/5] media: vimc: bug fixes related to memory management Dafna Hirschfeld
2019-10-03 10:44 ` [PATCH v2 1/5] media: vimc: initialize vim entity pointers to NULL Dafna Hirschfeld
2019-10-03 13:33 ` Helen Koike
2019-10-03 10:44 ` [PATCH v2 2/5] media: vimc: cleanup code that assigns entity in entities array Dafna Hirschfeld
2019-10-03 13:52 ` Helen Koike
2019-10-03 10:44 ` [PATCH v2 3/5] media: vimc: sensor: register subdevice only after initialization Dafna Hirschfeld
2019-10-03 15:14 ` Helen Koike
2019-10-03 10:44 ` [PATCH v2 4/5] media: vimc: move media_entity_cleanup to release callbacks Dafna Hirschfeld
2019-10-03 10:44 ` Dafna Hirschfeld [this message]
2019-10-03 15:17 ` [PATCH v2 5/5] media: vimc: remove the helper function vimc_ent_sd_unregister Helen Koike
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191003104409.15756-6-dafna.hirschfeld@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=andre.almeida@collabora.com \
--cc=dafna3@gmail.com \
--cc=ezequiel@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-media@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).