Commit 7b73ce9d authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab

media: v4l2-dev.h: fix symbol collision in media_entity_to_video_device()

A recent change to the media_entity_to_video_device() macro breaks some
use-cases for the macro due to a symbol collision. Before the change
this worked:

    vdev = media_entity_to_video_device(link->sink->entity);

While after the change it results in a compiler error "error: 'struct
video_device' has no member named 'link'; did you mean 'lock'?". While
the following still works after the change.

    struct media_entity *entity = link->sink->entity;
    vdev = media_entity_to_video_device(entity);

Fix the collision by renaming the macro argument to '__entity'.

Fixes: 69b925c5 ("media: v4l2-dev.h: add kernel-doc to two macros")
Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d2d476b7
...@@ -298,10 +298,10 @@ struct video_device ...@@ -298,10 +298,10 @@ struct video_device
* media_entity_to_video_device - Returns a &struct video_device from * media_entity_to_video_device - Returns a &struct video_device from
* the &struct media_entity embedded on it. * the &struct media_entity embedded on it.
* *
* @entity: pointer to &struct media_entity * @__entity: pointer to &struct media_entity
*/ */
#define media_entity_to_video_device(entity) \ #define media_entity_to_video_device(__entity) \
container_of(entity, struct video_device, entity) container_of(__entity, struct video_device, entity)
/** /**
* to_video_device - Returns a &struct video_device from the * to_video_device - Returns a &struct video_device from the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment