This reverts commit ed64cf1e182fb30fe67652386c0880fcf3302f97.
This patch is no longer necessary as the entity register
callback is implemented at media_device level.
Signed-off-by: Shuah Khan <shua...@osg.samsung.com>
---
drivers/media/media-device.c | 7 -------
include/media/media-entity.h | 4 ----
2 files changed, 11 deletions(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 76590ba..c55ab50 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -428,8 +428,6 @@ EXPORT_SYMBOL_GPL(media_device_unregister);
int __must_check media_device_register_entity(struct media_device *mdev,
struct media_entity *entity)
{
- struct media_entity *eptr;
-
/* Warn if we apparently re-register an entity */
WARN_ON(entity->parent != NULL);
entity->parent = mdev;
@@ -442,11 +440,6 @@ int __must_check media_device_register_entity(struct
media_device *mdev,
list_add_tail(&entity->list, &mdev->entities);
spin_unlock(&mdev->lock);
- media_device_for_each_entity(eptr, mdev) {
- if (eptr != entity)
- media_entity_call(eptr, register_notify);
- }
-
return 0;
}
EXPORT_SYMBOL_GPL(media_device_register_entity);
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 0bc4c2f..0c003d8 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -46,7 +46,6 @@ struct media_pad {
/**
* struct media_entity_operations - Media entity operations
- * @register_notify Notify entity of newly registered entity
* @link_setup: Notify the entity of link changes. The
operation can
* return an error, in which case link setup will be
* cancelled. Optional.
@@ -55,7 +54,6 @@ struct media_pad {
* validates all links by calling this operation. Optional.
*/
struct media_entity_operations {
- int (*register_notify)(struct media_entity *entity);
int (*link_setup)(struct media_entity *entity,
const struct media_pad *local,
const struct media_pad *remote, u32 flags);
@@ -103,8 +101,6 @@ struct media_entity {
/* Sub-device specifications */
/* Nothing needed yet */
} info;
-
- void *private; /* private data for the entity */
};
static inline u32 media_entity_type(struct media_entity *entity)
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
