From patchwork Wed Jul 15 00:34:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 6790711 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 DBCB4C05AC for ; Wed, 15 Jul 2015 00:34:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63179206A2 for ; Wed, 15 Jul 2015 00:34:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42ECF206A6 for ; Wed, 15 Jul 2015 00:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbbGOAe1 (ORCPT ); Tue, 14 Jul 2015 20:34:27 -0400 Received: from resqmta-po-08v.sys.comcast.net ([96.114.154.167]:37225 "EHLO resqmta-po-08v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbbGOAe0 (ORCPT ); Tue, 14 Jul 2015 20:34:26 -0400 Received: from resomta-po-02v.sys.comcast.net ([96.114.154.226]) by resqmta-po-08v.sys.comcast.net with comcast id sQaC1q0024tLnxL01QaRk6; Wed, 15 Jul 2015 00:34:25 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-02v.sys.comcast.net with comcast id sQaP1q0011LXgTt01QaPeu; Wed, 15 Jul 2015 00:34:25 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id A5E62120418; Tue, 14 Jul 2015 18:34:22 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, tiwai@suse.de, perex@perex.cz, crope@iki.fi, sakari.ailus@linux.intel.com, arnd@arndb.de, stefanr@s5r6.in-berlin.de, ruchandani.tina@gmail.com, chehabrafael@gmail.com, dan.carpenter@oracle.com, prabhakar.csengg@gmail.com, chris.j.arges@canonical.com, agoode@google.com, pierre-louis.bossart@linux.intel.com, gtmkramer@xs4all.nl, clemens@ladisch.de, daniel@zonque.org, vladcatoi@gmail.com, misterpib@gmail.com, damien@zamaudio.com, pmatilai@laiskiainen.org, takamichiho@gmail.com, normalperson@yhbt.net, bugzilla.frnkcg@spamgourmet.com, joe@oampo.co.uk, calcprogrammer1@gmail.com, jussi@sonarnerd.net Cc: Shuah Khan , linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 1/7] Revert "[media] media: media controller entity framework enhancements for ALSA" Date: Tue, 14 Jul 2015 18:34:00 -0600 Message-Id: <49da931303fc040178a22dc46c161eeaf0d7a350.1436917513.git.shuahkh@osg.samsung.com> 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=1436920465; bh=HcKmZ8i1fCqlqP7/1sOwlRzBAR1xT43xNNW2dEApXPA=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=SWfshSr2ivz5FDyLh7X2AzeeaZGr6ZDRs0VKMhoP68dZu8f309hfhvsh+ucUyzwhK ggiz2QgekH07AEaXfL89wKwI4t1pbzY9/m+N3DhwJnfmtjq+Fd1Lu63158ZjCzokMt IAsy1yHclBd3GoZkK/ZIE7TW+EiLAhN0ar+i43oL8goMZOt725wSAt9Ospu/P5aLTa zeXAllp5hVqG+bMsaqb6KVtGT3GW/C5e6i1usmMp8auvsC5BBg0/Cxo36BByN+TOCv vvJRwQZkwNzb5Fwcwe3+WVHKtLmz0ZK32q6GAXbqIfwXQeyZdA3vs3takcgUDlok0c tcmdS1wCkaVYg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This reverts commit ed64cf1e182fb30fe67652386c0880fcf3302f97. This patch is no longer necessary as the entity register callback is implemented at media_device level. Signed-off-by: Shuah Khan --- drivers/media/media-device.c | 7 ------- include/media/media-entity.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 76590ba..c55ab50 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -428,8 +428,6 @@ EXPORT_SYMBOL_GPL(media_device_unregister); int __must_check media_device_register_entity(struct media_device *mdev, struct media_entity *entity) { - struct media_entity *eptr; - /* Warn if we apparently re-register an entity */ WARN_ON(entity->parent != NULL); entity->parent = mdev; @@ -442,11 +440,6 @@ int __must_check media_device_register_entity(struct media_device *mdev, list_add_tail(&entity->list, &mdev->entities); spin_unlock(&mdev->lock); - media_device_for_each_entity(eptr, mdev) { - if (eptr != entity) - media_entity_call(eptr, register_notify); - } - return 0; } EXPORT_SYMBOL_GPL(media_device_register_entity); diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 0bc4c2f..0c003d8 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -46,7 +46,6 @@ struct media_pad { /** * struct media_entity_operations - Media entity operations - * @register_notify Notify entity of newly registered entity * @link_setup: Notify the entity of link changes. The operation can * return an error, in which case link setup will be * cancelled. Optional. @@ -55,7 +54,6 @@ struct media_pad { * validates all links by calling this operation. Optional. */ struct media_entity_operations { - int (*register_notify)(struct media_entity *entity); int (*link_setup)(struct media_entity *entity, const struct media_pad *local, const struct media_pad *remote, u32 flags); @@ -103,8 +101,6 @@ struct media_entity { /* Sub-device specifications */ /* Nothing needed yet */ } info; - - void *private; /* private data for the entity */ }; static inline u32 media_entity_type(struct media_entity *entity)