From patchwork Tue Sep 4 11:30:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 10587185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E36D13BB for ; Tue, 4 Sep 2018 11:30:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D1C82922A for ; Tue, 4 Sep 2018 11:30:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 415A729236; Tue, 4 Sep 2018 11:30:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C82AC2922A for ; Tue, 4 Sep 2018 11:30:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727064AbeIDPzP (ORCPT ); Tue, 4 Sep 2018 11:55:15 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39606 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726292AbeIDPzP (ORCPT ); Tue, 4 Sep 2018 11:55:15 -0400 Received: by mail-wr1-f67.google.com with SMTP id o37-v6so3568809wrf.6 for ; Tue, 04 Sep 2018 04:30:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ekjtkfz0ZByOvaUsDMLCAVgEr6dYbCQ/222lp+g7Arc=; b=J4S1UosNJOJWPgJxt1p0KLIHWGobgx0vjFusvEe+L/YxHCM1Tai9YdQGl8yhWy7oqb JVCTZvJEdJM/IONbIiJmEBySiXv/MC9DMEOTqT7zfpfl0W94TBN6n7mi/GPErPjzs18J rCXiX5ubEXmHs2ePpUIV10hOgVooE5HyIaBHhbr4fjKUdDOBZRsDcj1n1g88KWHrA2au zRJqke07LiWgPtHwM5DaoK3Ec36Mf4+EHWk+Hx3mw+Rt0veKhHL744H0VQVjJUiDm8tL Ic2FoCTJ2GK2vTt9GrtLBMX+s80eh7m2ylipWF2xFpBGps7CFoGaibIddH3xqhRimfoV 5kMw== X-Gm-Message-State: APzg51DhVZZhOpJHPzHx/O9ASTYPuTart3QWkPeO8g7YrtG2FsGPneP0 xrJ03Of1dOHlJiVp/UHYwfVMDA== X-Google-Smtp-Source: ANB0VdapWR4HEXGRnT38Tj2lIv2wr9eP7SYB2li8yTYKptaAK3fsptDQF0esIFNLFKjpB+Ec/sCMTA== X-Received: by 2002:a5d:528f:: with SMTP id c15-v6mr22751385wrv.102.1536060630228; Tue, 04 Sep 2018 04:30:30 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id s13-v6sm22574155wrq.39.2018.09.04.04.30.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Sep 2018 04:30:29 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Tian Shu Qiu , Sakari Ailus , Javier Martinez Canillas , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org Subject: [PATCH 1/2] [media] v4l: allow to register dev nodes for individual v4l2 subdevs Date: Tue, 4 Sep 2018 13:30:17 +0200 Message-Id: <20180904113018.14428-2-javierm@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904113018.14428-1-javierm@redhat.com> References: <20180904113018.14428-1-javierm@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently there's only a function to register device nodes for all subdevs of a v4l2 device that are marked with the V4L2_SUBDEV_FL_HAS_DEVNODE flag. But drivers may want to register device nodes for individual subdevices, so add a v4l2_device_register_subdev_node() for this purpose. A use case for this function is for media device drivers to register the device nodes in the v4l2 async notifier .bound callback instead of doing a registration for all subdevices in the .complete callback. Signed-off-by: Javier Martinez Canillas --- drivers/media/v4l2-core/v4l2-device.c | 90 ++++++++++++++++----------- include/media/v4l2-device.h | 10 +++ 2 files changed, 63 insertions(+), 37 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c index 3940e55c72f1..e5fc51b6604c 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c @@ -222,9 +222,59 @@ static void v4l2_device_release_subdev_node(struct video_device *vdev) kfree(vdev); } -int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) +int v4l2_device_register_subdev_node(struct v4l2_device *v4l2_dev, + struct v4l2_subdev *sd) { struct video_device *vdev; + int err; + + if (!(sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE)) + return -EINVAL; + + vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); + if (!vdev) + return -ENOMEM; + + video_set_drvdata(vdev, sd); + strlcpy(vdev->name, sd->name, sizeof(vdev->name)); + vdev->v4l2_dev = v4l2_dev; + vdev->fops = &v4l2_subdev_fops; + vdev->release = v4l2_device_release_subdev_node; + vdev->ctrl_handler = sd->ctrl_handler; + err = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1, + sd->owner); + if (err < 0) { + kfree(vdev); + return err; + } + sd->devnode = vdev; +#if defined(CONFIG_MEDIA_CONTROLLER) + sd->entity.info.dev.major = VIDEO_MAJOR; + sd->entity.info.dev.minor = vdev->minor; + + /* Interface is created by __video_register_device() */ + if (vdev->v4l2_dev->mdev) { + struct media_link *link; + + link = media_create_intf_link(&sd->entity, + &vdev->intf_devnode->intf, + MEDIA_LNK_FL_ENABLED | + MEDIA_LNK_FL_IMMUTABLE); + if (!link) { + err = -ENOMEM; + video_unregister_device(sd->devnode); + return err; + } + } +#endif + + return 0; +} +EXPORT_SYMBOL_GPL(v4l2_device_register_subdev_node); + +int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) +{ + struct v4l2_subdev *sd; int err; @@ -238,43 +288,9 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) if (sd->devnode) continue; - vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); - if (!vdev) { - err = -ENOMEM; - goto clean_up; - } - - video_set_drvdata(vdev, sd); - strlcpy(vdev->name, sd->name, sizeof(vdev->name)); - vdev->v4l2_dev = v4l2_dev; - vdev->fops = &v4l2_subdev_fops; - vdev->release = v4l2_device_release_subdev_node; - vdev->ctrl_handler = sd->ctrl_handler; - err = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1, - sd->owner); - if (err < 0) { - kfree(vdev); + err = v4l2_device_register_subdev_node(v4l2_dev, sd); + if (err) goto clean_up; - } - sd->devnode = vdev; -#if defined(CONFIG_MEDIA_CONTROLLER) - sd->entity.info.dev.major = VIDEO_MAJOR; - sd->entity.info.dev.minor = vdev->minor; - - /* Interface is created by __video_register_device() */ - if (vdev->v4l2_dev->mdev) { - struct media_link *link; - - link = media_create_intf_link(&sd->entity, - &vdev->intf_devnode->intf, - MEDIA_LNK_FL_ENABLED | - MEDIA_LNK_FL_IMMUTABLE); - if (!link) { - err = -ENOMEM; - goto clean_up; - } - } -#endif } return 0; diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index b330e4a08a6b..bf25418a1ad6 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h @@ -185,6 +185,16 @@ int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, */ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); +/** + * v4l2_device_register_subdev_node - Registers a device node for a subdev + * of the v4l2 device. + * + * @v4l2_dev: pointer to struct v4l2_device + * @sd: pointer to &struct v4l2_subdev + */ +int __must_check v4l2_device_register_subdev_node(struct v4l2_device *v4l2_dev, + struct v4l2_subdev *sd); + /** * v4l2_device_register_subdev_nodes - Registers device nodes for all subdevs * of the v4l2 device that are marked with