From: Laurent Pinchart Date: Mon, 2 May 2011 19:21:03 +0000 (-0300) Subject: [media] v4l: Fix media_entity_to_video_device macro argument name X-Git-Tag: v3.0-rc3~35^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [media] v4l: Fix media_entity_to_video_device macro argument name The name 'entity' is used twice in the macro body, once as the macro argument, and once as a structure field name. This breaks compilation if the macro is called with its argument not named 'entity'. Fix this by renaming the macro argument '__e'. This should avoid namespace clashes. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 93e96fb..c7c40f1 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -128,8 +128,8 @@ struct video_device struct mutex *lock; }; -#define media_entity_to_video_device(entity) \ - container_of(entity, struct video_device, entity) +#define media_entity_to_video_device(__e) \ + container_of(__e, struct video_device, entity) /* dev to video-device */ #define to_video_device(cd) container_of(cd, struct video_device, dev)