From patchwork Mon Jan 29 04:40:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189223 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 1562260388 for ; Mon, 29 Jan 2018 05:03:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05C37286AB for ; Mon, 29 Jan 2018 05:03:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED9BB2621D; Mon, 29 Jan 2018 05:03:39 +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 14B6B2621D for ; Mon, 29 Jan 2018 05:03:39 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7F151267FD3; Mon, 29 Jan 2018 05:59:32 +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 161CB267FD1; Mon, 29 Jan 2018 05:59:29 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id BE88E267D85 for ; Mon, 29 Jan 2018 05:40:33 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 29 Jan 2018 13:40:32 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3F99C76A53; Mon, 29 Jan 2018 13:40:32 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270917759" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:40:31 +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=ahf18u08YCcZQt/CMbfmKxTdpTzjjWISMUXfXXJIF1k=; b=oeb7zYmnjRKrGDT6H/DcMh8PthJHwXttMkIdh2xLjeEmmn/wgzhCUKOluYY5vP3AA6NecxE4ecA0EZNE16Ffi9CQ08cGgD54dUqnzzNIaPwpqwiBrOlxZI84vwy5tzTc1I9b2Z+miMJD117qAZr8ie1wnG2T8rKJAXLbUH7DyCY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 04:40:29 +0000 Message-ID: <87o9lduvmh.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: <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 04:40:29 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OS2PR01CA0139.jpnprd01.prod.outlook.com (2603:1096:602::33) To SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e789d7de-e85e-457f-28f0-08d566d26d1e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1888; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 3:a/zflHCLWA0lm/XRbQQRDwHScZjmf+zzoqrmGrXRmQfKWVSvR8NdcmtEibkO6k8zbKOMwGfBF2inCxj/NZOOWtjWergEXCJ/Enjkhx1PpVcf7dV13mnR3fWTIB58sx8D8HCs1tBKGRr2Uc0EOS/NUSvOwMyG6SSTH8gUW+VyvZJSx7Rm/ZodbzPhglN0o9V8ReRSYUWCzfNU/EbYV5K8S9UfxyliGOgagLLMc5yHbzuv85qzMHhmCUxnTitgTMzk; 25:EG53P8DKWsvkFgrh4EOMN3ScfLL68rZaSchCFvGrgFNyIwrTIKd2pdVQGbJVvtPZv3UkdkgkuPcw95p/KH6uMiPV/HWU4qw5zrIKORtaCOW6AcA2nNaV3kZZo9JGAYcp2Jel+cPocM8FuLSVcy9kET8MrhoqfRLEFRoD6Nhy3GFAozXvJswLU7aJ6QC0mvN573y0Tdg9l6xQ9HQ5whu6IyiQIPpwwQ4ETXLAVKDKJ5Uo6uuK55neLbt7KHdJY7ePLOmnEvKV0qHiURVQtr9ThKOsdUBmDqz+foduUV70PWHU/nOhoF1iD7M0H5unfRP9I6zt4UW4UOiPAJFTw23QyQ==; 31:cDRJ/NpLyc7Zbnbyp7eolv9lfPbNpebwvhiTRygB0dhx4OKwLwMuWqczJo+QAfyz6+SQy7GZULf3zV6hPWOBDDb0e+usUOuVhM+Mb3Z8notUlvsJcrzRMsI7F4ZRv7Z6OTeMUA2D4KV7B+zTISWsKDImC2Y+uzeoclisEvWm0Od+IX0J/pPQYRT4jOxo2JGTHtIGCadKbm9iInmB6Da9NuFDbH9IA4aGfmK4ddfRWVk= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1888: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:deFB3A3ZmCLn20UbigiXOVR161bS4LclM7o/PN8/2iHZeNl+quxTEu3pz7Zah8/c1HlBPHHnRurajZrLCrZUo1TwWfbqokV/U9A3f+8eb1y5YJRAVKOZkfQe27Il0UtQdiOoFCrFgU4n4arPM3+y1LSB/S9GqH0xwZgZ/iVt2x+kz/IGVmp6TyvLBDEAJAt0Nctp+N7BWofAt3TziNnbJvxwdhwQ406fpTWMaKDNVcqzx2FnqaPdXz5Wq34p5RPCoSaB/9dHkE29HTKNI+FNk8Tg1ERMOI+lK4ZSrBttFPycSuIJKHZZCf6B6yymUgf5+QXd70hecLO1JxT+XX2cvXZE840TC1OzBHHHkr5FWdN/sPcWARVOVpGDd8H13g3zMmEanHzsdQs/xRjmwk2CfwFUMQoRjlhcPZoOu6OibfFJrKM+zxAfSqQ1RsoBBd0VCaINt0enZkEOUQ7DlXcXcSTeq+ON2PWGdvVf81PVXtVVaHhkNW7EPurfpRwMd7t/; 4:dnEsiMlpAGMqENngh34xWaMqwChpOQVSMrYJKMwy1v5fIJiEMqYIuUwW+6AjkGZdC703YCK8DszpCzvyy2sC3nhx+GBOYU8xEGExE5gKTTo4/pCjnZHjxR3RYEReAwekO4QYuG+oe9jtB9A+/mPbfwD89bSVM6BiEBdpisFbxDnS5LcjZxmDtGBPo8eeQFIeTn4DrvCBaNXFQ/JQ2AoQlB8Klrda+U6mnFIuMdi4WF2Isv/QiKcjCWnu4dC6D0PzyCjdC96LC00eY+JhHmwReoBEukZn+GcVfkGHmPttOjnkGoPWLiPVQ0vY81n7vyC+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(944501161)(93006095)(93001095)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:SG2PR0601MB1888; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1888; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(376002)(39380400002)(346002)(396003)(199004)(189003)(6116002)(68736007)(47776003)(3846002)(50466002)(66066001)(106356001)(23726003)(2906002)(478600001)(97736004)(53416004)(16526019)(81166006)(81156014)(305945005)(8936002)(8676002)(7736002)(186003)(316002)(58126008)(386003)(83506002)(2950100002)(52116002)(7696005)(4326008)(25786009)(76176011)(6486002)(105586002)(53936002)(36756003)(86362001)(69596002)(26005)(6916009)(5660300001)(16586007)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1888; 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; SG2PR0601MB1888; 23:BBSfFJ7EuBdnZk1CWsCksCy5MAwkEUT/19OBqXo?= =?us-ascii?Q?tIZ1mvrXNmRG0a9uHA02wAmn9e4ZEKz01psu/kodXaOeNyReHPNsjErwDFFn?= =?us-ascii?Q?CSEV4/DymPrVISbTQsiehZVkHj0ZgjEBecVEvawpIpCiQpnAmgzb9uUAnRAI?= =?us-ascii?Q?lqObgwD2PKw7+T0SALTl16L10ROLtTyvded3+da9RavNYXSWu2wPBGz9aUbq?= =?us-ascii?Q?KUa8NcCG+TSbNkAVF6WGTE6L/KwKpbgC8apxBKgz2sr5uzjhz9y1it+5O+mS?= =?us-ascii?Q?JF1waFRS+I3SeQ9oIYGel8BvGWYdlYdd7xlKdQxJgMdKaEdgVtx7WZaqyRgr?= =?us-ascii?Q?ESO0ttEi6Xls0SszcsAdvmS/CVrZVeZ3fK88jkF4EItTp4NvpktWALqiMl4O?= =?us-ascii?Q?woFWhpk4CjSUKkeVjpaqFTHBvpP0QsUQlNBpQtIXzJZpV/tIxqGuQ0dy+ODc?= =?us-ascii?Q?m48vyWF+mjgpoh1qt2Y9s1Ow0Lijm9tUloa261P1wZ2eQJ3ci1lrLKm3asAJ?= =?us-ascii?Q?dSqzMLl7Lr69FndPEHEG5Kj8Jxp6RkEA6+bOP1IdeEvPyo2qREiF+rwzLc+4?= =?us-ascii?Q?TN9gdlASsj9njsWRr7lFi0CaQJDRnwRTIktTlM6WbCSpnR5zJBRS64HlChj/?= =?us-ascii?Q?+gixC7fc6Du1kG/VBScUbf09wkvqHu803yswev5WRoAE9xvc1Ak4GdMPIXu4?= =?us-ascii?Q?XF6i/Gz3AeyCCYc7RBa59W8RyyQLaH3c+tli3+9+dSwVpKzvI5wjvjOrQLbL?= =?us-ascii?Q?Ms5bAGRanCrfp59TK39DqJJIHl8uFDaOghB/JiKd0moYgIUC97xXHifGAapO?= =?us-ascii?Q?zPwTuqO+ySoUWBsfKYkDgwg+HM8JMZ6Nh80Q5xM5wk/KxHzkBOwZv7j9722l?= =?us-ascii?Q?IXRHQIAHOfz4DMqtwd4uamz/m/HVGrjn0sd00nMGb+GiVLLEdOpaB5hn9wfc?= =?us-ascii?Q?AUtNCD0QHUCblITBQWutBCRxYhiP52rpHqqlTzomQ+bnrEfmk7B2cJ1i4D2X?= =?us-ascii?Q?nh6dlis2nWjlFNAGIfGtF/xORddCnQiZVOb9T6w+bb54sPimNWHzqS2rp7Vz?= =?us-ascii?Q?P+f5QNdkPJOszU6XL9H2jhVE7IZlgN4eGBAtT6fZb2XgA0uKhTt0lm0HIfWT?= =?us-ascii?Q?wmo0MlS2Sr6wXecxBF0P/7CVJYoIJCtwNTFBuTEfZZMqE/aib+L7Mig=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 6:JGNccgkFcrWv3mLno4aLjzdhAM+WmhGMMNjzyghfns9Tk5+IULnYts0woM9olugcTKubo3uJtn7teaOBsjFd3KBSRvksmOOyYNv70C6En2f1u0XZPhFw/pN8S8NbanxznwoiJNtd8GY7hrxN+sqBfKkcft/KG7BCiSdX3iVQa8ueNNMDBKrwqJnStkGiZdpVi6sn0CD4jtLfYIUgimKAS2MvqFiERm5Rljo4xZbWX6yWdWjj+iDzxTBe5Z11gjbnGLL8+R/+DQJosdFqHNqo6hlUn1Ag/n1Edbm3p1J8GMPjFVmfsRiUqmMU+17wSbeuHWSNysc3XqKnQfXD2nECn0Vc6BP0tliCI7AKFjMMRfk=; 5:/R7Y5lvHhHRRWVTZ1sGc2VV46t+hn45RqoewCwjezEkJv/ajYNiIWxylF8j7dxTyrd/8ByCi4z2Pk4tEx/gAEGgrV9jpYgpIqKdJTzQP0dFM2yt6hPgkfkDxwl/vlWDTonSFG6q++9ZI8UjMnEFhZbOFtgPDCRIIQCH9RHL2v8w=; 24:MS5qScCmbQFY20lRdLPhJ6rbDBxywHWiSqpEZoW2beT4ARGGSSj67f3hsCtpQt08tWneDD0CneO1fIZLRIBe/3rcPrRbhINNMwyFoWTaia4=; 7:2BIa5qp5E8dVPYgjg5wTWbN0se89aTDglXDdWkz9NioJOz0WIqfFv5Z0v3sVU9IdwESYvkbqf6qpewz7BopmEcFGS2dXUPEi1HjeWVI9Inc6NQtyC34iba+WQ6p1wjqLcZg6E6LcjqvasKe40p86LwFD4Qk8Xxuvf6FI1LT8QTYY9orLpTpDKtDrfcqLBqgfxU/gPa4HXZ1EFSgR5a2/UNzm2EwhIZx9dGZkI+OwmFwpupNr652dkx/pX0oIe1cf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:ZECG9ssG88I/0JIJ6k9xjus+T3PC6iKlqgW2KkAz7+8iUhA/qefbDDVjpZXhJvqiJG3iP/C8yPHHpbLpcuGNQQR1bPJ5jibeBFwMNN0DA/eSexfjMZrW3Bh3NGjhOtPvcMGWQOjAjPkiNiGz61BfyCWDYNyCj4IC+c6/CKfoB5g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:40:29.8589 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e789d7de-e85e-457f-28f0-08d566d26d1e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1888 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 170/186] ASoC: dmic: 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 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/dmic.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index cf83c42..32a8f71 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -71,16 +71,16 @@ static int dmic_daiops_trigger(struct snd_pcm_substream *substream, .ops = &dmic_dai_ops, }; -static int dmic_codec_probe(struct snd_soc_codec *codec) +static int dmic_component_probe(struct snd_soc_component *component) { struct gpio_desc *dmic_en; - dmic_en = devm_gpiod_get_optional(codec->dev, + dmic_en = devm_gpiod_get_optional(component->dev, "dmicen", GPIOD_OUT_LOW); if (IS_ERR(dmic_en)) return PTR_ERR(dmic_en); - snd_soc_codec_set_drvdata(codec, dmic_en); + snd_soc_component_set_drvdata(component, dmic_en); return 0; } @@ -95,14 +95,16 @@ static int dmic_codec_probe(struct snd_soc_codec *codec) {"DMIC AIF", NULL, "DMic"}, }; -static const struct snd_soc_codec_driver soc_dmic = { - .probe = dmic_codec_probe, - .component_driver = { - .dapm_widgets = dmic_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), - .dapm_routes = intercon, - .num_dapm_routes = ARRAY_SIZE(intercon), - }, +static const struct snd_soc_component_driver soc_dmic = { + .probe = dmic_component_probe, + .dapm_widgets = dmic_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int dmic_dev_probe(struct platform_device *pdev) @@ -129,16 +131,10 @@ static int dmic_dev_probe(struct platform_device *pdev) } } - return snd_soc_register_codec(&pdev->dev, + return devm_snd_soc_register_component(&pdev->dev, &soc_dmic, dai_drv, 1); } -static int dmic_dev_remove(struct platform_device *pdev) -{ - snd_soc_unregister_codec(&pdev->dev); - return 0; -} - MODULE_ALIAS("platform:dmic-codec"); static const struct of_device_id dmic_dev_match[] = { @@ -152,7 +148,6 @@ static int dmic_dev_remove(struct platform_device *pdev) .of_match_table = dmic_dev_match, }, .probe = dmic_dev_probe, - .remove = dmic_dev_remove, }; module_platform_driver(dmic_driver);