From patchwork Thu Feb 4 13:50:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameer Pujar X-Patchwork-Id: 1436018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.a=rsa-sha256 header.s=n1 header.b=pY3N+yBR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DWg3B6mNFz9sW0 for ; Fri, 5 Feb 2021 00:52:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236124AbhBDNvo (ORCPT ); Thu, 4 Feb 2021 08:51:44 -0500 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:10667 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236364AbhBDNvP (ORCPT ); Thu, 4 Feb 2021 08:51:15 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Thu, 04 Feb 2021 05:50:33 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 4 Feb 2021 13:50:33 +0000 Received: from audio.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Thu, 4 Feb 2021 13:50:30 +0000 From: Sameer Pujar To: CC: , , , , , , , Sameer Pujar Subject: [PATCH v2 1/3] ASoC: audio-graph: Rename functions needed for export Date: Thu, 4 Feb 2021 19:20:10 +0530 Message-ID: <1612446612-32613-2-git-send-email-spujar@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612446612-32613-1-git-send-email-spujar@nvidia.com> References: <1612446612-32613-1-git-send-email-spujar@nvidia.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1612446633; bh=jcj/sWYDH6F6INwt5+Upmxiy3TusPMPo5cYStrLeSR0=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=pY3N+yBR18UC2whKUbZxUK1JDJdz43+tmcqPLntNqjO+WSomloNfQCbBAEegNIPM/ 3IIWMh1JxOC/59hpXaLyt+cTR2Y6hVhj7sitXGmPeIyPV50LK9VYRiDeuf1qHxDmV3 F+itQrU6wgn8Ii69WEC4Oc/u1SjtLFlz9kKIDmMllIGH9Q+N8R73sin8kPzt9So0ye LJ6/HJVbjeFFi95N02GEXHcgjAdwW6fFB3tEVDz0xBuJ7d1/JEkltHyB6qSU4vH2jh gMhp1cRCAZYYAyffm2e8FWs13Z9V3+aTY+nLEHzfOs7UHG0pw+WLV8ULu8XS7MvNrd UMVsbyR0FckuQ== Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Following functions are renamed for a better global visibility. graph_card_probe() --> audio_graph_card_probe() graph_parse_of() --> audio_graph_parse_of() graph_remove() --> audio_graph_remove() [exported as well] The references in header and source files of audio graph are updated to make use of above. Signed-off-by: Sameer Pujar Cc: Kuninori Morimoto --- include/sound/graph_card.h | 6 ++++-- sound/soc/generic/audio-graph-card.c | 17 +++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h index bbb5a13..0137844 100644 --- a/include/sound/graph_card.h +++ b/include/sound/graph_card.h @@ -9,8 +9,10 @@ #include -int graph_card_probe(struct snd_soc_card *card); +int audio_graph_card_probe(struct snd_soc_card *card); -int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); +int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); + +int audio_graph_remove(struct platform_device *pdev); #endif /* __GRAPH_CARD_H */ diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 16a04a6..8c5cdcd 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -532,7 +532,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, static void graph_get_dais_count(struct asoc_simple_priv *priv, struct link_info *li); -int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) +int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) { struct snd_soc_card *card = simple_priv_to_card(priv); struct link_info li; @@ -608,7 +608,7 @@ int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) return ret; } -EXPORT_SYMBOL_GPL(graph_parse_of); +EXPORT_SYMBOL_GPL(audio_graph_parse_of); static int graph_count_noml(struct asoc_simple_priv *priv, struct device_node *cpu_ep, @@ -705,7 +705,7 @@ static void graph_get_dais_count(struct asoc_simple_priv *priv, li->link, li->dais, li->conf); } -int graph_card_probe(struct snd_soc_card *card) +int audio_graph_card_probe(struct snd_soc_card *card) { struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); int ret; @@ -720,7 +720,7 @@ int graph_card_probe(struct snd_soc_card *card) return 0; } -EXPORT_SYMBOL_GPL(graph_card_probe); +EXPORT_SYMBOL_GPL(audio_graph_card_probe); static int graph_probe(struct platform_device *pdev) { @@ -736,20 +736,21 @@ static int graph_probe(struct platform_device *pdev) card = simple_priv_to_card(priv); card->dapm_widgets = graph_dapm_widgets; card->num_dapm_widgets = ARRAY_SIZE(graph_dapm_widgets); - card->probe = graph_card_probe; + card->probe = audio_graph_card_probe; if (of_device_get_match_data(dev)) priv->dpcm_selectable = 1; - return graph_parse_of(priv, dev); + return audio_graph_parse_of(priv, dev); } -static int graph_remove(struct platform_device *pdev) +int audio_graph_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); return asoc_simple_clean_reference(card); } +EXPORT_SYMBOL_GPL(audio_graph_remove); static const struct of_device_id graph_of_match[] = { { .compatible = "audio-graph-card", }, @@ -766,7 +767,7 @@ static struct platform_driver graph_card = { .of_match_table = graph_of_match, }, .probe = graph_probe, - .remove = graph_remove, + .remove = audio_graph_remove, }; module_platform_driver(graph_card); From patchwork Thu Feb 4 13:50:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameer Pujar X-Patchwork-Id: 1436015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.a=rsa-sha256 header.s=n1 header.b=BkQeR+6Q; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DWg2V6BNYz9sXk for ; Fri, 5 Feb 2021 00:51:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236437AbhBDNvd (ORCPT ); Thu, 4 Feb 2021 08:51:33 -0500 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:16337 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236389AbhBDNvZ (ORCPT ); Thu, 4 Feb 2021 08:51:25 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Thu, 04 Feb 2021 05:50:36 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 4 Feb 2021 13:50:36 +0000 Received: from audio.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Thu, 4 Feb 2021 13:50:33 +0000 From: Sameer Pujar To: CC: , , , , , , , Sameer Pujar Subject: [PATCH v2 2/3] ASoC: tegra: Update references of audio graph helpers Date: Thu, 4 Feb 2021 19:20:11 +0530 Message-ID: <1612446612-32613-3-git-send-email-spujar@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612446612-32613-1-git-send-email-spujar@nvidia.com> References: <1612446612-32613-1-git-send-email-spujar@nvidia.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1612446636; bh=2pd/AAFg5WK8Z9T8q9P2ZlY87W9EDATBwGUAwCiwYCk=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=BkQeR+6QhRlKhDEgPxy6UFGIPv4QDrRzDG+oFlUteHrHqMqmGsAA7Y1JGbTtf/ogl EbcXVAjV3GFY7/CTQNy0Gd3dAOSdSotDCb/nwnSgmIj2GtGxOq5/Qe/POexb1rJlSc n0IqFTqgl5gxPg3xz+xK0WIMUvqXx9PbXhQpiNbMizxCmJNVg0NejlwhMakN/otCjj Y207POoob1DHm0fVKszVv2vX6snBlW8VRx2O2ccUtRe6xodhpbnhsBxFv+Q+kuY4z6 oM+VRZX/o0Ine/LGWc7ydcIl6x+xBwpU7m/NZ7YIIr1naHzCvm3gZY0j6QViq0eTul mLLzAA8SNA89g== Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The audio graph helper functions are renamed now for a better global visibility and hence references need to be updated in Tegra audio graph. Signed-off-by: Sameer Pujar --- sound/soc/tegra/tegra_audio_graph_card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c index 9e43f16..121e572 100644 --- a/sound/soc/tegra/tegra_audio_graph_card.c +++ b/sound/soc/tegra/tegra_audio_graph_card.c @@ -184,7 +184,7 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card) return PTR_ERR(priv->clk_plla_out0); } - return graph_card_probe(card); + return audio_graph_card_probe(card); } static int tegra_audio_graph_probe(struct platform_device *pdev) @@ -201,12 +201,12 @@ static int tegra_audio_graph_probe(struct platform_device *pdev) card->probe = tegra_audio_graph_card_probe; - /* graph_parse_of() depends on below */ + /* audio_graph_parse_of() depends on below */ card->component_chaining = 1; priv->simple.ops = &tegra_audio_graph_ops; priv->simple.force_dpcm = 1; - return graph_parse_of(&priv->simple, dev); + return audio_graph_parse_of(&priv->simple, dev); } static const struct tegra_audio_cdata tegra210_data = { From patchwork Thu Feb 4 13:50:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameer Pujar X-Patchwork-Id: 1436017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nvidia.com header.i=@nvidia.com header.a=rsa-sha256 header.s=n1 header.b=nA553Q5Q; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DWg2X0pZCz9sW0 for ; Fri, 5 Feb 2021 00:51:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236447AbhBDNvj (ORCPT ); Thu, 4 Feb 2021 08:51:39 -0500 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:16359 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236391AbhBDNvZ (ORCPT ); Thu, 4 Feb 2021 08:51:25 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Thu, 04 Feb 2021 05:50:39 -0800 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 4 Feb 2021 13:50:39 +0000 Received: from audio.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Thu, 4 Feb 2021 13:50:36 +0000 From: Sameer Pujar To: CC: , , , , , , , Sameer Pujar Subject: [PATCH v2 3/3] ASoC: tegra: Add driver remove() callback Date: Thu, 4 Feb 2021 19:20:12 +0530 Message-ID: <1612446612-32613-4-git-send-email-spujar@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612446612-32613-1-git-send-email-spujar@nvidia.com> References: <1612446612-32613-1-git-send-email-spujar@nvidia.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1612446639; bh=N/HUC5nO63V7ziFfbl7mA/9IeZbh8vyGK/1MWRYaR/M=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=nA553Q5Qn/JAbDDXTpn6CciLcUf8jDFG17YMMiyYR+RWB0OM4xc8ghkCF6fo2Qlsg s3Jw9WUO4QR++Xp3mMvaqExOfhTHsssYYrvL6LQwwR8ZM/26NZMBvJVrV4Vu/1L5RX OIHxtfYp4SJY5rlZQtXyV30vI/q3H5dyO8vuaXfCxF37sWlUhxpZj75/iXDUtZb7i1 XYMxuolQiUlz0alJRecNZbASBfEuGXlL+5X0eat8Yfa0Ymy+HelZ8AQo/K2x8zb4L9 KfCgzDeK3v7q7yzIKDiFSPk1spXkVQueuY8sytS16jPWDs625jMbn/aUvAOzMcs/yk cCVeYvYCReQBA== Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org There is cleanup required, related to release of phandles, during driver removal and hence point remove function pointer to audio_graph_remove(). Fixes: 202e2f774543 ("ASoC: tegra: Add audio graph based card driver") Depends-on: "ASoC: audio-graph: Rename functions needed for export" Signed-off-by: Sameer Pujar --- sound/soc/tegra/tegra_audio_graph_card.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c index 121e572..ddedf18 100644 --- a/sound/soc/tegra/tegra_audio_graph_card.c +++ b/sound/soc/tegra/tegra_audio_graph_card.c @@ -2,7 +2,7 @@ // // tegra_audio_graph_card.c - Audio Graph based Tegra Machine Driver // -// Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2020-2021 NVIDIA CORPORATION. All rights reserved. #include #include @@ -243,6 +243,7 @@ static struct platform_driver tegra_audio_graph_card = { .of_match_table = graph_of_tegra_match, }, .probe = tegra_audio_graph_probe, + .remove = audio_graph_remove, }; module_platform_driver(tegra_audio_graph_card);