From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:56231 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752466AbbLFBhq (ORCPT ); Sat, 5 Dec 2015 20:37:46 -0500 From: Laurent Pinchart To: Mauro Carvalho Chehab Cc: Linux Media Mailing List , Hans Verkuil , Sylwester Nawrocki , "Lad, Prabhakar" , Markus Elfring , Lars-Peter Clausen , linux-api@vger.kernel.org Subject: Re: [PATCH v8 38/55] [media] v4l2-subdev: use MEDIA_ENT_T_UNKNOWN for new subdevs Date: Sun, 06 Dec 2015 03:37:59 +0200 Message-ID: <5694046.QaGrXTB1hd@avalon> In-Reply-To: <84879cc0deb14467e5436af5287148ace5b15cce.1441540862.git.mchehab@osg.samsung.com> References: <84879cc0deb14467e5436af5287148ace5b15cce.1441540862.git.mchehab@osg.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: Hi Mauro, Thank you for the patch. In addition to my reply to Sakari's e-mail, please see below for a few small comments. On Sunday 06 September 2015 09:02:58 Mauro Carvalho Chehab wrote: > Instead of abusing MEDIA_ENT_T_V4L2_SUBDEV, initialize > new subdev entities as MEDIA_ENT_T_UNKNOWN. > > Signed-off-by: Mauro Carvalho Chehab > Acked-by: Hans Verkuil > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 659507bce63f..134fe7510195 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -435,6 +435,12 @@ int __must_check media_device_register_entity(struct > media_device *mdev, { > int i; > > + if (entity->type == MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN || > + entity->type == MEDIA_ENT_T_UNKNOWN) > + dev_warn(mdev->dev, > + "Entity type for entity %s was not initialized!\n", > + entity->name); > + > /* Warn if we apparently re-register an entity */ > WARN_ON(entity->graph_obj.mdev != NULL); > entity->graph_obj.mdev = mdev; > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c > b/drivers/media/v4l2-core/v4l2-subdev.c index 60da43772de9..b3bcc8253182 > 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -584,7 +584,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const > struct v4l2_subdev_ops *ops) sd->host_priv = NULL; > #if defined(CONFIG_MEDIA_CONTROLLER) > sd->entity.name = sd->name; > - sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV; > + sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN; > #endif > } > EXPORT_SYMBOL(v4l2_subdev_init); > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index f8725b881a1d..3d6210095336 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -42,6 +42,14 @@ struct media_device_info { > > #define MEDIA_ENT_ID_FLAG_NEXT (1 << 31) > > +/* Used values for media_entity_desc::type */ > + You remove this a couple of patches later, is it worth adding it in the first place ? > +/* > + * Initial value to be used when a new entity is created > + * Drivers should change it to something useful As you warn when the value isn't change I'd say "Drivers must change...". > + */ > +#define MEDIA_ENT_T_UNKNOWN 0x00000000 > + > /* > * Base numbers for entity types > * > @@ -75,6 +83,15 @@ struct media_device_info { > #define MEDIA_ENT_T_V4L2_SWRADIO (MEDIA_ENT_T_V4L2_BASE + 6) > > /* V4L2 Sub-device entities */ > + > + /* > + * Subdevs are initialized with MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN, > + * in order to preserve backward compatibility. > + * Drivers should change to the proper subdev type before > + * registering the entity. > + */ Leading tabs look weird here. > +#define MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_T_V4L2_SUBDEV_BASE > + > #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR (MEDIA_ENT_T_V4L2_SUBDEV_BASE + 1) > #define MEDIA_ENT_T_V4L2_SUBDEV_FLASH (MEDIA_ENT_T_V4L2_SUBDEV_BASE + 2) > #define MEDIA_ENT_T_V4L2_SUBDEV_LENS (MEDIA_ENT_T_V4L2_SUBDEV_BASE + 3) -- Regards, Laurent Pinchart