From patchwork Fri Sep 7 01:01:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10591425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6366F69B5 for ; Fri, 7 Sep 2018 01:20:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50A172B0AC for ; Fri, 7 Sep 2018 01:20:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44EDE2B099; Fri, 7 Sep 2018 01:20:21 +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=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham 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 EDA002B098 for ; Fri, 7 Sep 2018 01:20:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B9B6A26781F; Fri, 7 Sep 2018 03:01:13 +0200 (CEST) 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 4B918267846; Fri, 7 Sep 2018 03:01:11 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 7F31B267847 for ; Fri, 7 Sep 2018 03:01:08 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 07 Sep 2018 10:01:07 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 1A2A86299F; Fri, 7 Sep 2018 10:01:07 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,340,1531753200"; d="scan'208";a="291782997" Received: from mail-os2jpn01lp0150.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.150]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 07 Sep 2018 10:01:06 +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:X-MS-Exchange-SenderADCheck; bh=uZXEB+06G3iIwiPUvNamflftZFss+29GbX+Rdd/fC7A=; b=N+IpFSurv+5y/GVlw/RsnbCloJ5dfXH2Rpv9+bx08KjEGptqWrldOAWezW7jsZSCz7yXs+QTa8ZKtspt8yNXzo48BUCMrjo6tVhLqkN0eS2CPvd+JCsX2P1Z5AuAiDDGUa+2D8Vu6KrNdR0ayRyjsiZk2mkKq+ppY3pbq2uG3uA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TY1PR01MB1868.jpnprd01.prod.outlook.com (2603:1096:403:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Fri, 7 Sep 2018 01:01:05 +0000 Message-ID: <87musurutv.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87sh2mruw6.wl-kuninori.morimoto.gx@renesas.com> References: <87sh2mruw6.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 7 Sep 2018 01:01:05 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: OSAPR01CA0050.jpnprd01.prod.outlook.com (2603:1096:604:a::14) To TY1PR01MB1868.jpnprd01.prod.outlook.com (2603:1096:403:8::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c648406-b99a-4fdf-ac0b-08d6145d639b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1868; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 3:txIrPzvvpzA+Wf5Ch4XKdLG1Jay4wlu1rdulPowJxNpy8LRSrSMdn4wSAW6otTfEiiZflSyCU5iQxYgdB+zY7KQbamRmfvg1k3G+jt52CtwVjU8LcANKXpjFfY7z6ZsHXvoKmQgmAjVX1smxm2ErHLoZrNVbu0/CxA+itBwJy6uzXsT9HOy5zAn7E0Z41rwd7wV5FTYlJ2oZWmUy9atyDQoP69glTA1K9JS1RnhrhYNXP7FINgK0j5CM7VO4X2e4; 25:1wx5MMUO1Nf1E0gupRex3Oj6sdVwh/huQIAWuvdD+Fu9w/YdreIR7OOTn/SmflE5+DpZyfgJL3pnMo/CarYNBm66WGBH1eR/ZCJfQYZERBquwvx0Tns/BF8aIhUFaSDYKN6e8YE1LHzsoxFCYee7DbLeKMGQs7qvB0apoEeE96/ryMwinJupsaCDW4Ba/gP7bs2RSdrjfBlaubp+FN/WdjwfPBh06EkMQMwYEVZEeZbvs7qFIKsRYmwSJ/OasWyUR4W879qJZHVI+pSBl9zb4prygkreP2U/AkZjZZ6wLgQfdORmEpWsEwJRwcznEoKdLFm6PkjvUAODcj8FeRKSPw==; 31:ESInkV4aPCX7ujB4Q7CAeGF+Ylkabwm9biInyXtS/FJMfMnXTUESYMFtk4LdlRk7JimLB8T/AKYc3m09oBqq64g67FgksYoFbQge01BrqgMDaNzxHSBWbWV7OtXWFaa21w6WwlI5Qb5q4hlXXvq66zj1ZsFGoy8hp2Jd/R+ge3ioxB7lndDnb3R6763SiWqjpMEetj/v43aPT34BX5r1GmtOu+Xu+1sicSTbB2IRDVo= X-MS-TrafficTypeDiagnostic: TY1PR01MB1868: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 20:LDoFZuDLJI4cvO6S+VOejdldmW09SCv5KHjh1dG5ijyA3j/4fuq/GCKPb8j17gEEyPtQIbjuw/lbOze6DWVjtMPbqSINXq2qYPo6RvSv3KtDLWQqVN2TPzk3nwA0qW/472NaQgxhWLPa1b0MSE+p00k7bui4sjL25/3YfxyP+5Qf6S2tXkd/D3F1/rb9dfIlZZ1IqBT5XSmkfL1Vpd63R1pkRudtbq6VpuhAsbWqidDAwqMKzOx5/Yj06z6t+Pdhjh/bRJGIKEbYTX6AZwWbYAk0+/lkwwR/YG5CDD0vU/K2sJHBAm7D7bE+ZwMrdsn1tw9OmKyAapd1L3JrlrxY8WtYfwTQRsvfK0JB6mdT+TZve+xKyy18lPmOk90h6SculXuq4i3ZV0V6SvOygudL1f6j5t9+UXvE3rUkmmF75igCcV/bJYULD2JUUmFlEUcKOQm6eHYdPkeR1Xo56fAysvxjgXOK/1AGFz3ShwyhBoYINm9XaLtEoDltHArzHS4K; 4:9yPyuY270ie2OMU0apuxZRmlb1Ci+w35GES+4x4+Jwh1fN+euHwQ7pPWgC4U70JlrROoUDddmd5PlbPtAsyTcn/nw6UJVcetL/yt05HDDdAVPDrQ/fBpvbh41iphRnxk39kBRYmNT8iUmlWtRaMcQ0lKuteIOautA/5vtZsJpk36xEihn8NLRFw9KaXHIaQar0PVW+VN00G+mlyqRLk9o4qh8dbAyKJqZePn7oeyn3nSCOSHB9cNjNSKeGTZuxNH3DGg9vq/nZ80rWjqtcUa9A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:TY1PR01MB1868; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1868; X-Forefront-PRVS: 07880C4932 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(136003)(366004)(346002)(39860400002)(376002)(189003)(199004)(106356001)(50466002)(105586002)(16586007)(316002)(86362001)(23726003)(97736004)(3846002)(6116002)(6916009)(53416004)(5660300001)(4326008)(26005)(386003)(8936002)(6486002)(81166006)(7696005)(52116002)(25786009)(8676002)(2906002)(446003)(956004)(58126008)(68736007)(76176011)(69596002)(81156014)(486006)(11346002)(36756003)(2616005)(16526019)(305945005)(66066001)(47776003)(476003)(7736002)(186003)(478600001)(53936002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1868; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TY1PR01MB1868; 23:xnQPEWZNErA3pAkGwGVs6rCESHaxvxfO60KiIUPv/?= 070C3gjVF43daCMTI6YbPEGj/pjK/f9fkHOXpihRs/t8+Nu0PkMdViX4s2y2uaG3TqtTv/WAmoNCRN4F8G3JqeKxiXG/OlI5RTE8G9Pt54qAf0h8xTcG3wrXkbKliT1CNioLi61rX4nI+bIOlHHjfZfFN1YvK0gYei6JRzOifMYqMUTXf7+CWevxDdGzWokPYIf9PtJHv7TmFR1g0GS2aJj2iXdGpbGJ15oC0+xkIsDyuy6RhgoxYVPjzoV0ReSTnh9KuqjhomTYpWmnkaZhuthtH1uEwHxCotpRUindngOhPRD78ks3SjO1oVvxm5iz9mdt24JS3X7LQf5xYoIjYKItJ8C9zAh6VWBqxJDPCm1vFmglUxbyyU17hTf2ZNziWnw8WS6g8XyMxl9Hn1a8SQQlXSvOQOij0cTquBrvs/lViRZFhaxnN6hDaOmcFVVT7E+map57QAg336qGwnelW9nfMkPNXKs4Wa0j8/NTX/HNT+YhYmtvUQYLRL7EWAf4hiB4uNMEKW3ZU74NxSsrVCM4sHp9GEci7YxVQSCw8swFoQ7HCkJbGIJlfDg/N6cnqm7VtkTx3VpozdgoApuYXiVuwNjK+xJCFQUcy7llTnlQaNvmm3ASsoKAG0+QOwj9ePz2zgBb/aS0CrQGi4ly7dsrTxQry6l/DpsLLD18+tR/pE633hw84uw9qhsYWiVuA0sdh67SoGWwNq7gDI8/9BgwO0Ae+NFZlvEI2Y5EJNdT1zMbUrvyrV8TnkfnNU1Q8fqJhH2vyan1ZF9zeMy0/bEQEZkPqsMBzDYADWgWolNJY6/2KBsbe+liZyNAayEpV9koUVaUUCPwCTfIS+Ozd91JLGHXgYFqbBnPxKkfQ9HgxZroPc9xwqfkISeEiIUYyNScRZ/xCLu9t817B1yJRebg8W5hYN0QvktVf29GewHw41YMMBkgv6k9Buu2FmhyMqGG86Fe0OjqWiuLa6HIs89ojzNfMzV7WncmuOd8v2+Ad31l1RhnsLS5ZUMwocWblU7RI8hE8uFNEBQB9AlOMKSplEs6/YsLRh9GIiTOH4NRz9Akeo2AfKAtC9/+SRPZj1SxzIy1nRBaKQXFtjIV6RFLD60DID/HPTYeSBEshAo0CBM7xFABOqW4ow+1+c+oxk= X-Microsoft-Antispam-Message-Info: K3vWaLjok9Q7eboRuAumtIChFQhr9yo0E+W05WZG0jSNolNz9BR3HT3xZsadzXarl2+8bXOvWIj9+PN6huSe3fksp82LTXWQbbWJjGkttf2iLCXoyq2yVxa0sK/+7cTBXrTyNMwR+v8Dg/3XHWANwdw4Wnu0IsiOxO1ge3pd2VmRftP/JxvynzD5SFDrC5iTW8AwGLkpF5PhxRkU0PTto81Ctvg/cAJETU66uKXYVdrjHPM/9KDIcYIsh9D2Y7g6cLYQnvYZR82OrP+mHUvwUnNRVPzJ0u1L2uenFIDYcfpSDsji9+bdPiRD+eCaG7GWvp6exenR8epJfPcmLR18pSIHi4eJFLRDJGr+HV7KV5g= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 6:7mR6scVghmaIwbxsGpwgdxRgwwvRgTvEAPq/EM447BzfJsuDA56bQND+6ccqpvZ72npYK8GcbmbX+7wwsyFoqCEMNW55U6Ndw0C+2DtvTiitcHds6srYK6LAgNb7kHDbk0LMxxFo0vLvCqog6/N/UtnUJXg8qN7Tw5Ohz8udV9QI6mKUbo+Ni9aB93mRmi3e6zF1el/L/M4GUdyhSIsgUJAelH5rFOxbFyFNrCOpSEmepcuSq6Y2pafA+TwUFuNJEKXwVo4hzVpzWME0Dbnpe8K3tXyZXqUZPTH6vZ0gdT+Yy0cE5VY+8KV3AzYTVc6hXHxdCFTqHQVHSClYAxSgUTrJttldePPS7WvMkUM1qPs8+ck3cHZGo5R9DNUfKZxTSActgD81CqnkY8LRsIhCEnoZ0+NwCqxLp3ZZXuJVG2wfpjYydy3omSCdOkQB0o1g4tFjpOwSpEgXZPdCrGSt5w==; 5:zMQhGqVRJoaiGnsn6G8IWuUpRoci6yDyQO4h9XNqoCPqqSaqUhL7yRXcjQ67KLUksIICdptFGHXb/VqA4pn4T46ifQl0fSBdmb8JZx8w2q6E11LASwED7j1aS7hbz0NuC8NpT97mSh5WCePKEwySd46cp4pJpuzbcpx/wiVNTuM=; 7:wwLyFbyqL7ugSdTpsqlWSPL5Dcxa10jzexZvKqpA9SNBrbQHF3xquT327mlpeRYId3ox+7fpA4vtac4AeqXTzqlHLGd3i7b7C4hUK9hkB+BVg3twNZ3di7gdftS0xFEHUgbYQWO+FbeR4lH7NRb/M0yzpb2mmCk+nxjKM8sExKQbYh1S9fbDnsIV9pzYXK/lerVM72yPA5ojZeDepnd3KeGZx3HC7RRw1l5VwbsoRRV0pEPeCYsWPGG1O5TLL4af SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1868; 20:KSquHafiMMmboZ9L5e4FDopmK/I9SQ16hbD+UxUkfSE0YaUMfJZf2fGOtron/7L12GI2IYK6ZeLeSuPMBpobzc8fN1gHK8M+Tb0e7P0+M1NnSsX1aRW6iyFHZrVZBFvxxSFw8xINQZNANr65Ej9pzA87rHJrP8CCq36eZ4qhVSo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2018 01:01:05.2039 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c648406-b99a-4fdf-ac0b-08d6145d639b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1868 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 04/16] ASoC: cirrus: use devm_snd_soc_register_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 have devm_snd_soc_register_component(). Let's use it instead of snd_soc_register_component(). Signed-off-by: Kuninori Morimoto --- sound/soc/cirrus/ep93xx-ac97.c | 8 ++------ sound/soc/cirrus/ep93xx-i2s.c | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index cd5a939..ecbe3c2 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -399,19 +399,17 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) if (ret) goto fail; - ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, + ret = devm_snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, &ep93xx_ac97_dai, 1); if (ret) goto fail; ret = devm_ep93xx_pcm_platform_register(&pdev->dev); if (ret) - goto fail_unregister; + goto fail; return 0; -fail_unregister: - snd_soc_unregister_component(&pdev->dev); fail: ep93xx_ac97_info = NULL; snd_soc_set_ac97_ops(NULL); @@ -422,8 +420,6 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) { struct ep93xx_ac97_info *info = platform_get_drvdata(pdev); - snd_soc_unregister_component(&pdev->dev); - /* disable the AC97 controller */ ep93xx_ac97_write_reg(info, AC97GCR, 0); diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 0918c5d..f5c3407 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -478,19 +478,17 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); - err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component, + err = devm_snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component, &ep93xx_i2s_dai, 1); if (err) goto fail_put_lrclk; err = devm_ep93xx_pcm_platform_register(&pdev->dev); if (err) - goto fail_unregister; + goto fail_put_lrclk; return 0; -fail_unregister: - snd_soc_unregister_component(&pdev->dev); fail_put_lrclk: clk_put(info->lrclk); fail_put_sclk: @@ -505,7 +503,6 @@ static int ep93xx_i2s_remove(struct platform_device *pdev) { struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); clk_put(info->lrclk); clk_put(info->sclk); clk_put(info->mclk);