From patchwork Fri Aug 19 10:23:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9290019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E997600CB for ; Fri, 19 Aug 2016 10:24:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8113C29398 for ; Fri, 19 Aug 2016 10:24:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70B732939A; Fri, 19 Aug 2016 10:24:14 +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=-6.9 required=2.0 tests=BAYES_00,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 162AF29333 for ; Fri, 19 Aug 2016 10:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754472AbcHSKYI (ORCPT ); Fri, 19 Aug 2016 06:24:08 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:46814 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754270AbcHSKYG (ORCPT ); Fri, 19 Aug 2016 06:24:06 -0400 Received: from lanttu.localdomain (unknown [192.168.15.166]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id DDA42600B0; Fri, 19 Aug 2016 13:24:01 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org, hverkuil@xs4all.nl Cc: m.chehab@osg.samsung.com, shuahkh@osg.samsung.com, laurent.pinchart@ideasonboard.com Subject: [RFC v2 10/17] media: Provide a way to the driver to set a private pointer Date: Fri, 19 Aug 2016 13:23:41 +0300 Message-Id: <1471602228-30722-11-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471602228-30722-1-git-send-email-sakari.ailus@linux.intel.com> References: <1471602228-30722-1-git-send-email-sakari.ailus@linux.intel.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 Now that the media device can be allocated dynamically, drivers have no longer a way to conveniently obtain the driver private data structure. Provide one again in the form of a private pointer passed to the media_device_alloc() function. Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil --- drivers/media/media-device.c | 3 ++- include/media/media-device.h | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 6c8b689..27d5214 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -699,7 +699,7 @@ void media_device_init(struct media_device *mdev) } EXPORT_SYMBOL_GPL(media_device_init); -struct media_device *media_device_alloc(struct device *dev) +struct media_device *media_device_alloc(struct device *dev, void *priv) { struct media_device *mdev; @@ -716,6 +716,7 @@ struct media_device *media_device_alloc(struct device *dev) media_devnode_init(&mdev->devnode); mdev->dev = dev; media_device_init(mdev); + mdev->priv = priv; return mdev; } diff --git a/include/media/media-device.h b/include/media/media-device.h index 8ccc8e8..cfcec1b 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -52,6 +52,7 @@ struct media_entity_notify { * struct media_device - Media device * @dev: Parent device * @devnode: Media device node + * @priv: A pointer to driver private data * @driver_name: Optional device driver name. If not set, calls to * %MEDIA_IOC_DEVICE_INFO will return dev->driver->name. * This is needed for USB drivers for example, as otherwise @@ -117,6 +118,7 @@ struct media_device { /* dev->driver_data points to this struct. */ struct device *dev; struct media_devnode devnode; + void *priv; char model[32]; char driver_name[32]; @@ -200,6 +202,7 @@ void media_device_init(struct media_device *mdev); * media_device_alloc() - Allocate and initialise a media device * * @dev: The associated struct device pointer + * @priv: pointer to a driver private data structure * * Allocate and initialise a media device. Returns a media device. * The media device is refcounted, and this function returns a media @@ -208,7 +211,7 @@ void media_device_init(struct media_device *mdev); * References are taken and given using media_device_get() and * media_device_put(). */ -struct media_device *media_device_alloc(struct device *dev); +struct media_device *media_device_alloc(struct device *dev, void *priv); /** * media_device_get() - Get a reference to a media device @@ -235,6 +238,16 @@ struct media_device *media_device_alloc(struct device *dev); } while (0) /** + * media_device_priv() - Obtain the driver private pointer + * + * Returns a pointer passed to the media_device_alloc() function. + */ +static inline void *media_device_priv(struct media_device *mdev) +{ + return mdev->priv; +} + +/** * media_device_cleanup() - Cleanups a media device element * * @mdev: pointer to struct &media_device