From patchwork Fri Jan 12 01:45:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159437 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 9C9AD601A1 for ; Fri, 12 Jan 2018 02:42:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8532B28817 for ; Fri, 12 Jan 2018 02:42:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79CB82897C; Fri, 12 Jan 2018 02:42:12 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DD4F28817 for ; Fri, 12 Jan 2018 02:42:11 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9EDF12682FB; Fri, 12 Jan 2018 03:37:25 +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 709A82682ED; Fri, 12 Jan 2018 03:37:24 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id AACD82680E8 for ; Fri, 12 Jan 2018 02:45:55 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 12 Jan 2018 10:45:54 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id C7F1D6B6EE; Fri, 12 Jan 2018 10:45:54 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="268010959" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Jan 2018 10:45:54 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Z0dqpYf2HLkF5Z1Xim0aLCVrhRtWIq1MhYJ5GXxqXco=; b=aLP4T7JmGKhNNetrTTRAqpFPtnN4W06M6Q1Vfaez/NB+t7b/7PE2eIUjC0Fsq2dYubrp3l+eQ5Hr9iqHs1QTPyiMwtmXq0ENbA5fr3fFMLns8Pnl821i21WZ15gahQxgTSoKC5Q1SzzfKxZd6BB+U4dkuWNW5/hRS0i+iH2VMx0= Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 01:45:52 +0000 Message-ID: <874lnr7svm.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> References: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 01:45:52 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0061.jpnprd01.prod.outlook.com (2603:1096:402:b::21) To HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6cd4c23-d7eb-4c28-68c6-08d5595e371a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1873; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 3:zmI9V90tVfNdhLb3SEnWksdP+qTHbcYQc7jxQNi2tkWY8Xa8+s97RCJqt78qxqO0md90VhJHasPoi6AwJiMAI7IK9NaUia+nty/ykzgghpxoU+t+tOg14jAzr3JNHQfyudhT93zOBCB6KrtcH/50Y3v3YR/OW7l92PkcvY0P+yBmg5hlzG/XLTm9+2FcoTb/we44jCxPLDhye7I1F3CvON0Vzp8dr97TOoHlpQ/U3pVD6894/FTXS5QNOkQLExeu; 25:iJL6R80RKrnpcEAieFgUnQszl58Saoi/olLos9OFeLHgp7XJodHdIrx11/txS7c8QxU/nyq1uBg/H5321yuX3t+iipv975mUzd+hlILGsWQDFVA/iUQWgRIMokM5PwcnjtNJOOND5t9z6fhca8OOT1RXOl/Zut/CNBg4/h2qnvGMptw0RxegV/oNgGXzldnGJditqykRE9YnA5XXgisxFSYT9NFrUyFHVq4+gsdyrM0D1Ev7C0IOzBLmyvWn/znc0jw6kjqKdRorLqKrTZGtY6nTVzDVlKECJtAWCGiDE9a8XfwpOeyvmtO6D/lYYIpwTRDgWZyGsFZm2I/jyGinZw==; 31:QJO/d+EJSsOKpalG33WqxEBI28rjFVj1UEDb4UJu/7w6G+SnkegKTfnTEEQcKO3foCXbwPwNnoFbI+d2OkwtU4OvztbcbyC7jKvdu4vZ+/grslVnehBR7avsD0C7mVU6Ul3yMIqIDJMcnUrMARyv4oum8PKN4ZucZGFHhIbpimRRqNvrGslWBPjwX+RG0Rx+ikth2oh0BJ9qNIVLgXWpOYH1wp4lOn2jfSlxBk3+dFI= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1873: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:nIwD3QdanJX+g4kQ0J3vWr9Hd0qOpV7GsxW97YtDRJXgI+wje7Zw0DshBUUQ+x1e6uY/a8+SqcBRaKCmHxjkh+hWjB/nboOEe9epKgZ+ws8SRZlhcaovTJ6QkD6vR6yd9ptL91z/78KhN8IsAV9d7U0PKgXH/Yd0rg0r55JoDEtxCalsfXHgb4HrPUM3T0VlQ8hxzGD1IwUZQop9eh2ZWM4j+PT5aKF+07AZXrhBWnTxRttT5RODmYC4Sq8FTTnRD5hIwMcY+0i81DfxidN9YyZ/mU9J030zN4dzAs13pkyGLy1fnjL8DgDKbMls4ccpgFICDoVJt4a1RRISVtS/nb4KscAewHH9PtQfHjkSMrnsTQ1+60KMhXIfmGyyiW7YV7SdkU7LHpoqi/sJJfqFts0LfXwxyIqIzsxaWl7iqBR1DvX7Qf9/4PPKcYcJY2PU9th/n7MJUKmmYx1f7JFydU1Xo/leds/s+pLzbuDsF5B7sVwDbjWUvyZJXwGhlLE8; 4:kl6TeJHeUEMSZfeehpAX+ZpdBOgtHk5s6353auWf8KlXoveyqeDVmNcgM1rWnTvKjWCZ0ZEUOpYi40JyoOqOfLJcuJQ8cTjYoifJl/PDq7Y6aMZLV+gf1M1/RWm0nAinWWGL/m+Aj7e3iKM+Oz1If4mnAL/vA+qUUpYpfMBuYAARh0OC8bQgyk6v1/wfqsIsI1hVO0vvnEl0k5qkwr5ZnTRZVrrz4p/FK8eSg8UGPh7Zqrl67yfQkFDiUej7Q6HANYgbV9VxWTQY08HxeNcAY5KhJ8AN9nS5cCwTGLI0dhRVH3quKUx2f/fTr+oy8xqx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231023)(944501138)(93006095)(93001095)(6055026)(6041268)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:HK2PR0601MB1873; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HK2PR0601MB1873; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(396003)(346002)(39860400002)(376002)(366004)(199004)(189003)(478600001)(25786009)(386003)(8936002)(6486002)(316002)(16586007)(305945005)(7736002)(2906002)(47776003)(3846002)(106356001)(59450400001)(2950100002)(50466002)(6916009)(7696005)(36756003)(5660300001)(66066001)(52116002)(76176011)(105586002)(53936002)(53416004)(23726003)(68736007)(8676002)(86362001)(16526018)(81156014)(81166006)(6116002)(4326008)(54906003)(83506002)(69596002)(97736004)(58126008)(21314002)(32563001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1873; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1873; 23:Mxp3k5Six1YVJGr4Gg1m4BplRCJXJ1sASTX/UvR?= =?us-ascii?Q?sT/F2gKuGhge0LWSRfF73BNWy67OODfEnC0qd2s0xeDE6JI3g4lpdEhZ8fhz?= =?us-ascii?Q?Xs251XDT3I1/z9NmEGtvnhAj6dfS9hrzLjfgCvdSplYURtxIB2GF0KiRaDv9?= =?us-ascii?Q?2Ar2WHOF1kkRviGJ9lvJnzPxsFAPQWTbAvbrwxRvDzG2ux8sJER/Kaf58iUf?= =?us-ascii?Q?0bjJNBOHN4nMZunH207CC8PG2JFvD1WEVTHhySXQ+Z1CbKqT8SbcRTgTZIAY?= =?us-ascii?Q?2t4hYKGB/MCE63IRQqNn/YXkMGyXkXMxo85kN0S7EGVAjchSV0dlt7TsxBdU?= =?us-ascii?Q?yOZCnURCXtWyfyOQVX4yiau2dxd3uK+BV+yut6O0OZsLaX9xqw/hTb7UgqU9?= =?us-ascii?Q?Uw3HpLSu5WNJf9ehq3mTwO38laTXe3X8CSoTmUSeqiaP0xavDDpnHtH4SbLj?= =?us-ascii?Q?+wHXfn3uexXSPS/IU1/OqmVSNM8PxLwvPCydHBol2c5dcEVJtsb1Pbxva6Dz?= =?us-ascii?Q?i8b6SsiHaU+yRPxzSb6LFnCUZZhl7eF6+1vxmP0gj7V8sibsvqTdrjnmz38K?= =?us-ascii?Q?w85zNmUXDht7hWTr87a6cV1rqro3YLnxDUCjp/AK6j2BXFEfG8k7eRv0AZi9?= =?us-ascii?Q?XNQRGBMPLX8b0ANzI+WTrjwsgO7MypGtCG3cgJCJelBoE6HZu+9mRS6bhU6y?= =?us-ascii?Q?ywi8e+XaWmVoxr1XkZX8T5CnCmGW19hZ6Id4cK0fpbu9lDIK1SQqhxuWwWih?= =?us-ascii?Q?encmW7SSC3ZM8YbKqoY1JGpZPw7Ef5jV5AAmEYPyLLeoMXbwI33wLDVX64Bn?= =?us-ascii?Q?+J0cUim9J+awFhPwiZY0RMoryYnUexjzhDUaGoY+yGPz4wk8I5mK5/LN4TDX?= =?us-ascii?Q?MuiAJGU2t8TYsHvsf3/urKXazFtJ8dNoX3bjbxXNj1F/oqO0F4F57MNoraTC?= =?us-ascii?Q?8FJVScMLbETqI2NfAL8UOTKIg0M2JoUUPh8xMECdLlQUTkSSfe+MBgcwk3To?= =?us-ascii?Q?tDQ0U+hD2AxxmXEP3pfmRAEzCoL0A+2PQdORO6C98aDHEX3ffnENTxfTW7FV?= =?us-ascii?Q?ohoha2haCwnuKWxDDcrdGVvyxQh0PpukfriDQqSX66uLfmf/WvEJ2R0RTvVk?= =?us-ascii?Q?lNWUTlhD1WrXF9Gp0pXmzxmQved9GOgnN/N4mf71uZiK/7rSASpN5V67n82t?= =?us-ascii?Q?fgb+RIUGdsI0K24Q=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 6:svtCwu/deIm/tZ9ttfU07dfNfsnV2nhgcw2Ci3YVM0poCKWpsyGbwPPVdKCHrCql/mAlte82txqvLz2lANnxAODtVpSXooevfvWWN/MtEBf3J66sk/ZDBOYBO9XbDXRt2RMLrwUSZ6Lco8vN1godO/GZGlQfMxLc6++q12vObI8IXEdWWAYOHzHLv8j5hItrU1s8cMBNoM6xpaeyr1yGy/P2Eh4Qy4qXjbOuUQpglyurjqSIFkyT18wkSWO86cgJE+fRBzw/QFRTWDc9TbpCu5BKfXjQQQWU+3FXL2FrK+6xAoj2q/gu0qJwcUMX+tWnBwEZ+RH/cusS00/QbPbZi2B1XGiKrzMywcYTCflHoqE=; 5:c0SNQMa9YvRu5Yjw93zVYHxgUNVkb95ZBjCvr0ZbxR7CRX08Sq7wii+rAybjYUbE+Ad3K/sda48/v6z6Yn1IyObtnbtotNJGzNSfQLEdeBlimnfu/NbTcIsg+2Dp4Tc95LowubpT2huPrttxr/zLILC9if1vr/ZQ9/UB3bqnVjQ=; 24:S03ubz91dL7LaTqXwFMD5lRREaAKv02wA2ODyoURxRG6vjuXHIN1Caa0RvW9ovbtRvZO/vFTgvyx5D8vU4q8kM1RpmypcGuWcCP20uXXuVo=; 7:bwGJVN31I6EU1vxfbZYMQ8aGbzZe1N4tEnslvNogLaXeTDaEsBTWWHbWL5bEJcLup3w4Jqw0z79S6+lOA7HoCzr8Z+Zs5mFU0mN9ZgQuSvjBjsxEbuO5yrD41l2ktr4q2hYfuZedNQOh9+KMkmXW3a1LOeyJwAb3uHOznnOB+kp0dF1t53tdY353cuoSABZTU1kR/St8qnZZNEc/c42UbsvX3JDOGbIjmGLTVNWNOH170TpI2XjdtS6+oZiLQhIi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:67SYUpSSLX+55K6jG16+CVA8fjCGzwfeBPLPKgP0F6UE9s/UoZShraZ2Ssp3HvqveGYCjlSjFquSSm8oa7sn77n2BxTMfxDKOFRj93a0zgOBZqTKJIrTsbCnLY3orT5tr8nKwm6S5tZh9/YV0LLLEr1aPaT9hL0NVLLU/W4XK3E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:45:52.5162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6cd4c23-d7eb-4c28-68c6-08d5595e371a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1873 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 130/187] ASoC: sun8i: replace codec to component 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/sunxi/sun8i-codec.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 3dd183b..3eab48a 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -166,7 +166,7 @@ static int sun8i_codec_get_hw_rate(struct snd_pcm_hw_params *params) static int sun8i_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct sun8i_codec *scodec = snd_soc_codec_get_drvdata(dai->codec); + struct sun8i_codec *scodec = snd_soc_component_get_drvdata(dai->component); u32 value; /* clock masters */ @@ -286,7 +286,7 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct sun8i_codec *scodec = snd_soc_codec_get_drvdata(dai->codec); + struct sun8i_codec *scodec = snd_soc_component_get_drvdata(dai->component); int sample_rate; u8 bclk_div; @@ -422,13 +422,15 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, .ops = &sun8i_codec_dai_ops, }; -static const struct snd_soc_codec_driver sun8i_soc_codec = { - .component_driver = { - .dapm_widgets = sun8i_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun8i_codec_dapm_widgets), - .dapm_routes = sun8i_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(sun8i_codec_dapm_routes), - }, +static const struct snd_soc_component_driver sun8i_soc_component = { + .dapm_widgets = sun8i_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun8i_codec_dapm_widgets), + .dapm_routes = sun8i_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(sun8i_codec_dapm_routes), + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config sun8i_codec_regmap_config = { @@ -488,7 +490,7 @@ static int sun8i_codec_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_codec(&pdev->dev, &sun8i_soc_codec, + ret = devm_snd_soc_register_component(&pdev->dev, &sun8i_soc_component, &sun8i_codec_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register codec\n"); @@ -516,7 +518,6 @@ static int sun8i_codec_remove(struct platform_device *pdev) if (!pm_runtime_status_suspended(&pdev->dev)) sun8i_codec_runtime_suspend(&pdev->dev); - snd_soc_unregister_codec(&pdev->dev); clk_disable_unprepare(scodec->clk_module); clk_disable_unprepare(scodec->clk_bus);