From patchwork Wed Dec 20 15:42:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 122477 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5741940qgn; Wed, 20 Dec 2017 07:43:06 -0800 (PST) X-Google-Smtp-Source: ACJfBos/k73AHS3CS7SGHQ8bHGDSUvpiWHEuE8iTN/trUAEQyS5m6ErdVPqz/T/RRhITdD87Qo6N X-Received: by 10.28.67.2 with SMTP id q2mr6772120wma.38.1513784586576; Wed, 20 Dec 2017 07:43:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513784586; cv=none; d=google.com; s=arc-20160816; b=wo714syGysb/FcA7LWEc3bSpU/R3GSNBi0MIA1/PFcuE3/lltjHdmwAASVMoLVuS2F M7so6zgX0TkgAlcrk4S0h1vif6+uByzB5NFNk4NMPlnX8EHmb1jmMehXKBF/jL9L6ldP 2Mo1OJPvv2AFT+N5jV5sCdLFwgl2CD6Zbtr2FkNv/X0k5d7wKVS4BemZIjz8CHjkNSHY gluhV4iME1+y4lOreuWBbM6bgB3kvIX1zwOOY+cFdpPesfNUJGO1NpqvH/PNW74Y2ImX t30nzIX0DoMVRVLnPlZfgVIEfRb9LA+Zx3qLkq3qej1ixes8c7T4uwVy3EZyhtkUWbJQ OC/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=nDkmoamFLOT7XX+l31xQGeZNOjw85xwj6K7blK6Em9I=; b=IU7bRCkf5FbGFhZmGbhfnZr5jPppz/VK+IRF3wkrXt/GdGt+p6CvmQ/O59An9o1loe 3iBOaY5JmPgJ+Wu5PHyuNJJVqqlK/5RqFzMvuyz78vnGemYREdzuWarwaWjAMiGbMHRS /bQW/a13ATjofIFpEC1VIYtFnkXYZE6nNAYXOXGHvB8V5zFuj0pjY2T2FJXz5edLIjvm hlqxKxwh28CLjKISBcXj6si4CZFmGSDrjyCa+nUjpF/PkpQ1eyi8qcewzFmT3hxVwsIL 9I1Iu5kEKVoxyVyIm9y/2L0HHVW9EpWi0EWkRC8nsceYgVtkfnk6sYd0dmF41gBcixBe WZxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Tsu7/VgQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z63si3210237wmz.126.2017.12.20.07.43.06; Wed, 20 Dec 2017 07:43:06 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Tsu7/VgQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 17FED26780C; Wed, 20 Dec 2017 16:42:35 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D433126780D; Wed, 20 Dec 2017 16:42:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 414E326780B for ; Wed, 20 Dec 2017 16:42:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=eHPBtOvGuIn6ttJ7y2p/0Jj04X/ekNuOyA3PJ07Qf0k=; b=Tsu7/VgQwHBZ iQe1zsZLj9nd6hSqJSeMg/6RbOCOC9BiEBWBfhhfKE+buHnPn9bAY7N8Tx9QL5kNQt0Lzty7TDBF8 iYMSO36z2fi/UBTnyr1ejvLuAIdhGg/XUYWD1QgQ7c4QeHdCcqNYng8NFeMi2VAeMPkVwoPj2TqQ9 nT+5A=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eRgVn-00053J-My; Wed, 20 Dec 2017 15:42:27 +0000 Received: from broonie by debutante with local (Exim 4.90_RC3) (envelope-from ) id 1eRgVn-00012S-8f; Wed, 20 Dec 2017 15:42:27 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87vah2xjob.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 20 Dec 2017 15:42:27 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: hdac_hdmi: keep DAI driver pointer in private data" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: hdac_hdmi: keep DAI driver pointer in private data has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 1e02dac395fadfff1f2c6bd90f1180f64a9cbebe Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 20 Dec 2017 01:48:13 +0000 Subject: [PATCH] ASoC: hdac_hdmi: keep DAI driver pointer in private data struct snd_soc_component::dai_drv will be removed soon. hdac_hdmi is only user of it. Let's keep it on private data. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/hdac_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 68a4a6b4e68e..15c3638fe345 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -136,6 +136,7 @@ struct hdac_hdmi_priv { struct mutex pin_mutex; struct hdac_chmap chmap; struct hdac_hdmi_drv_data *drv_data; + struct snd_soc_dai_driver *dai_drv; }; #define hdev_to_hdmi_priv(_hdev) ((to_ehdac_device(_hdev))->private_data) @@ -1035,7 +1036,7 @@ static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm) struct snd_soc_dapm_route *route; struct hdac_ext_device *edev = to_hda_ext_device(dapm->dev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(&edev->hdev); - struct snd_soc_dai_driver *dai_drv = dapm->component->dai_drv; + struct snd_soc_dai_driver *dai_drv = hdmi->dai_drv; char widget_name[NAME_SIZE]; struct hdac_hdmi_cvt *cvt; struct hdac_hdmi_pin *pin; @@ -1437,6 +1438,7 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdev, } *dais = hdmi_dais; + hdmi->dai_drv = hdmi_dais; return 0; }