From patchwork Fri May 8 19:31:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 6367271 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 008CBBEEE1 for ; Fri, 8 May 2015 19:39:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E35B20268 for ; Fri, 8 May 2015 19:39:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10C5E200E0 for ; Fri, 8 May 2015 19:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753036AbbEHTju (ORCPT ); Fri, 8 May 2015 15:39:50 -0400 Received: from resqmta-po-09v.sys.comcast.net ([96.114.154.168]:44006 "EHLO resqmta-po-09v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932157AbbEHTjt (ORCPT ); Fri, 8 May 2015 15:39:49 -0400 X-Greylist: delayed 491 seconds by postgrey-1.27 at vger.kernel.org; Fri, 08 May 2015 15:39:49 EDT Received: from resomta-po-18v.sys.comcast.net ([96.114.154.242]) by resqmta-po-09v.sys.comcast.net with comcast id RXWv1q0045E3ZMc01XXdeJ; Fri, 08 May 2015 19:31:37 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-18v.sys.comcast.net with comcast id RXXa1q00S1LXgTt01XXaTu; Fri, 08 May 2015 19:31:37 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 75EAE40E84; Fri, 8 May 2015 13:31:34 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, tiwai@suse.de, perex@perex.cz, agoode@google.com, pierre-louis.bossart@linux.intel.com, gtmkramer@xs4all.nl, clemens@ladisch.de, vladcatoi@gmail.com, damien@zamaudio.com, chris.j.arges@canonical.com, takamichiho@gmail.com, misterpib@gmail.com, daniel@zonque.org, pmatilai@laiskiainen.org, jussi@sonarnerd.net, normalperson@yhbt.net, fisch602@gmail.com, joe@oampo.co.uk Cc: Shuah Khan , linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 1/2] media: new media controller API for device resource support Date: Fri, 8 May 2015 13:31:30 -0600 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1431113497; bh=701jDgQz4D/BVQwNTm7ltR37dR2qrzM2B9jIIk+ILBo=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=B1TdcnANyuG5RNRxwnW+EJ5xXxnC4mHUMjEUnGXO3QdQArBxhqiFarISe8KHv73bZ Er5wGClN2g5hNjK5yDx0G/tQbURMESrXxtqisFzD2gTkNhV2fKW1lZQ0aDs/dKN2QG hbdrrsnb0KldOiCs+DvY6bHFTx/4Dqr6dwBA6n5oRyZjlsD4o29aKrDYdUrZ9HGQnU i3w6xuRzrThiDy5MLAt6KQ0DGqw38Bz7BNEFV7XHaAmukmEy25tw75UMj/UsH3Is8E tEhDwnPYttn6xIKiabcQBa73lVKX4GRDjcHFERzdGkvlC2gTk91Af/ZKuMIpB8U3Rb HZnLMloiWTIHg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add new media controller API to allocate media device as a device resource. When a media device is created on the main struct device which is the parent device for the interface device, it will be available to all drivers associated with that interface. For example, if a usb media device driver creates the media device on the main struct device which is common for all the drivers that control the media device, including the non-media ALSA driver, media controller API can be used to share access to the resources on the media device. This new interface provides the above described feature. A second interface that finds and returns the media device is added to allow drivers to find the media device created by any of the drivers associated with the device. Signed-off-by: Shuah Khan --- drivers/media/media-device.c | 33 +++++++++++++++++++++++++++++++++ include/media/media-device.h | 2 ++ 2 files changed, 35 insertions(+) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 7b39440..1c32752 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -462,3 +462,36 @@ void media_device_unregister_entity(struct media_entity *entity) entity->parent = NULL; } EXPORT_SYMBOL_GPL(media_device_unregister_entity); + +static void media_device_release_dr(struct device *dev, void *res) +{ +} + +/* + * media_device_get_dr() - get media device as device resource + * creates if one doesn't exist +*/ +struct media_device *media_device_get_dr(struct device *dev) +{ + struct media_device *mdev; + + mdev = devres_find(dev, media_device_release_dr, NULL, NULL); + if (mdev) + return mdev; + + mdev = devres_alloc(media_device_release_dr, + sizeof(struct media_device), GFP_KERNEL); + if (!mdev) + return NULL; + return devres_get(dev, mdev, NULL, NULL); +} +EXPORT_SYMBOL_GPL(media_device_get_dr); + +/* + * media_device_find_dr() - find media device as device resource +*/ +struct media_device *media_device_find_dr(struct device *dev) +{ + return devres_find(dev, media_device_release_dr, NULL, NULL); +} +EXPORT_SYMBOL_GPL(media_device_find_dr); diff --git a/include/media/media-device.h b/include/media/media-device.h index 6e6db78..53d0fc3 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -95,6 +95,8 @@ void media_device_unregister(struct media_device *mdev); int __must_check media_device_register_entity(struct media_device *mdev, struct media_entity *entity); void media_device_unregister_entity(struct media_entity *entity); +struct media_device *media_device_get_dr(struct device *dev); +struct media_device *media_device_find_dr(struct device *dev); /* Iterate over all entities. */ #define media_device_for_each_entity(entity, mdev) \