Re: [PATCH 05/13] media: v4l: Make media_entity_to_video_device() NULL-safe

[Sakari Ailus <sakari.ailus@linux.intel.com>]

On Wed, Jul 09, 2025 at 11:54:49PM +0300, Laurent Pinchart wrote:
> On Wed, Jul 09, 2025 at 08:03:07PM +0000, Sakari Ailus wrote:
> > Hi Laurent,
> > 
> > On Tue, Jul 08, 2025 at 07:17:47PM +0300, Laurent Pinchart wrote:
> > > On Tue, Jul 08, 2025 at 12:02:29PM +0000, Sakari Ailus wrote:
> > > > On Tue, Jul 08, 2025 at 02:56:16PM +0300, Laurent Pinchart wrote:
> > > > > On Thu, Jun 19, 2025 at 04:14:43PM +0000, Sakari Ailus wrote:
> > > > > > On Thu, Jun 19, 2025 at 06:20:33PM +0300, Laurent Pinchart wrote:
> > > > > > > On Thu, Jun 19, 2025 at 11:15:38AM +0300, Sakari Ailus wrote:
> > > > > > > > Make media_entity_to_video_device(NULL) return NULL, instead of an invalid
> > > > > > > > pointer value.
> > > > > > > > 
> > > > > > > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > > > > > > > ---
> > > > > > > >  include/media/v4l2-dev.h | 14 ++++++++++----
> > > > > > > >  1 file changed, 10 insertions(+), 4 deletions(-)
> > > > > > > > 
> > > > > > > > diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
> > > > > > > > index 1b6222fab24e..069c2f14b473 100644
> > > > > > > > --- a/include/media/v4l2-dev.h
> > > > > > > > +++ b/include/media/v4l2-dev.h
> > > > > > > > @@ -313,10 +313,16 @@ struct video_device {
> > > > > > > >   * media_entity_to_video_device - Returns a &struct video_device from
> > > > > > > >   *	the &struct media_entity embedded on it.
> > > > > > > >   *
> > > > > > > > - * @__entity: pointer to &struct media_entity
> > > > > > > > - */
> > > > > > > > -#define media_entity_to_video_device(__entity) \
> > > > > > > > -	container_of(__entity, struct video_device, entity)
> > > > > > > > + * @__entity: pointer to &struct media_entity, may be NULL
> > > > > > > > + */
> > > > > > > > +#define media_entity_to_video_device(__entity)				\
> > > > > > > > +	({								\
> > > > > > > > +		typeof (__entity) __me_to_vdev_ent = __entity;		\
> > > 
> > > This should be __me_vdev_ent to align the naming with
> > > media_entity_to_v4l2_subdev().
> > > 
> > > > > > > > +									\
> > > > > > > > +		__me_to_vdev_ent ? container_of(__me_to_vdev_ent,	\
> > > > > > > > +						struct video_device, entity) : \
> > > 
> > > And here you should write
> > > 
> > > 	__me_to_vdev_ent ?						   \
> > > 		container_of(__me_vdev_ent, struct video_device, entity) : \
> > > 		NULL;							   \
> > 
> > I'm fine wrap after '?' as well, but another wrap is needed due to
> > indentation in any case.
> 
> I didn't make it clear, my comment was about replicating the style of
> media_entity_to_v4l2_subdev().

Ok, I'll use that in v3.

-- 
Sakari Ailus