{"id":3603,"url":"https://patchwork.libcamera.org/api/patches/3603/?format=json","web_url":"https://patchwork.libcamera.org/patch/3603/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200428210609.6793-5-jacopo@jmondi.org>","date":"2020-04-28T21:06:07","name":"[libcamera-devel,v5,4/6] media: v4l2-subdev: Assume V4L2_SUBDEV_API is selected","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"fd8f38d7719da7c266473441bb3bad4a83582b80","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3603/mbox/","series":[{"id":846,"url":"https://patchwork.libcamera.org/api/series/846/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=846","date":"2020-04-28T21:06:03","name":"media: Register read-only sub-dev devnode","version":5,"mbox":"https://patchwork.libcamera.org/series/846/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3603/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3603/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3445660AF4\n\tfor ;\n\tTue, 28 Apr 2020 23:03:14 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 34E38200005;\n\tTue, 28 Apr 2020 21:03:12 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"linux-media@vger.kernel.org,\n\tlibcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi , mchehab@kernel.org,\n\thverkuil-cisco@xs4all.nl, sakari.ailus@linux.intel.com,\n\tandrey.konovalov@linaro.org, laurent.pinchart@ideasonboard.com","Date":"Tue, 28 Apr 2020 23:06:07 +0200","Message-Id":"<20200428210609.6793-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.26.1","In-Reply-To":"<20200428210609.6793-1-jacopo@jmondi.org>","References":"<20200428210609.6793-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 4/6] media: v4l2-subdev: Assume\n\tV4L2_SUBDEV_API is selected","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 28 Apr 2020 21:03:14 -0000"},"content":"A sub-device device node can be registered in user space only if the\nCONFIG_V4L2_SUBDEV_API Kconfig option is selected.\n\nRemove checks from the v4l2-subdev file handle open/close functions and\nioctl handler as they are only accessible if a device node was registered\nto user space in first place.\n\nSigned-off-by: Jacopo Mondi \n---\n drivers/media/v4l2-core/v4l2-subdev.c | 10 ++--------\n 1 file changed, 2 insertions(+), 8 deletions(-)","diff":"diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c\nindex 1dc263c2ca0a..f3fe515b8ccb 100644\n--- a/drivers/media/v4l2-core/v4l2-subdev.c\n+++ b/drivers/media/v4l2-core/v4l2-subdev.c\n@@ -24,22 +24,19 @@\n \n static int subdev_fh_init(struct v4l2_subdev_fh *fh, struct v4l2_subdev *sd)\n {\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tif (sd->entity.num_pads) {\n \t\tfh->pad = v4l2_subdev_alloc_pad_config(sd);\n \t\tif (fh->pad == NULL)\n \t\t\treturn -ENOMEM;\n \t}\n-#endif\n+\n \treturn 0;\n }\n \n static void subdev_fh_free(struct v4l2_subdev_fh *fh)\n {\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tv4l2_subdev_free_pad_config(fh->pad);\n \tfh->pad = NULL;\n-#endif\n }\n \n static int subdev_open(struct file *file)\n@@ -329,10 +326,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n \tstruct video_device *vdev = video_devdata(file);\n \tstruct v4l2_subdev *sd = vdev_to_v4l2_subdev(vdev);\n \tstruct v4l2_fh *vfh = file->private_data;\n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tstruct v4l2_subdev_fh *subdev_fh = to_v4l2_subdev_fh(vfh);\n \tbool ro_subdev = test_bit(V4L2_FL_SUBDEV_RO_DEVNODE, &vdev->flags);\n-#endif\n \tint rval;\n \n \tswitch (cmd) {\n@@ -466,7 +461,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n \t\treturn ret;\n \t}\n \n-#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)\n \tcase VIDIOC_SUBDEV_G_FMT: {\n \t\tstruct v4l2_subdev_format *format = arg;\n \n@@ -646,7 +640,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)\n \n \tcase VIDIOC_SUBDEV_QUERYSTD:\n \t\treturn v4l2_subdev_call(sd, video, querystd, arg);\n-#endif\n+\n \tdefault:\n \t\treturn v4l2_subdev_call(sd, core, ioctl, cmd, arg);\n \t}\n","prefixes":["libcamera-devel","v5","4/6"]}