From patchwork Fri Jan 12 00:45:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10158905 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 DC698602A7 for ; Fri, 12 Jan 2018 00:46:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9C702883C for ; Fri, 12 Jan 2018 00:46:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE42628902; Fri, 12 Jan 2018 00:46:02 +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 D12A92883C for ; Fri, 12 Jan 2018 00:46:01 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8D82C2679E0; Fri, 12 Jan 2018 01:46:00 +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 DF9E62679E0; Fri, 12 Jan 2018 01:45:58 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 1C38B26798E for ; Fri, 12 Jan 2018 01:45:24 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 12 Jan 2018 09:45:23 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 713A56B90E; Fri, 12 Jan 2018 09:45:23 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269303491" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 09:45:22 +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=hRTfkd6FD9/xwldKYxHocCf1V+fy+OJiJnPe4giBOf0=; b=LJJ6itkpyxm5srcFGsF6crPJ0OBws1v8Wt5Orfg87NN5TyT/0BJcyYbwXTnzA75QHr1Q6lqFgz3aIDT8s3o8UeaU9M/IAnxpAD3Y4b5Nv7plb0vFOHP8lUtdTezKeZ4VCSH5vbbkA4Q/rFTPYG6Wuz4dCpw9EBD10XpwzxIKOjI= 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 KL1PR0601MB1878.apcprd06.prod.outlook.com (2603:1096:802:7::23) 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 00:45:20 +0000 Message-ID: <87inc7gb37.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: <87vag7gb9o.wl%kuninori.morimoto.gx@renesas.com> References: <87vag7gb9o.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 00:45:20 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0176.jpnprd01.prod.outlook.com (2603:1096:402::28) To KL1PR0601MB1878.apcprd06.prod.outlook.com (2603:1096:802:7::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5eb37c3f-1149-4739-b06b-08d55955c275 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1878; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 3:TuP2Si7H3Mr0yq2NreTD0u96+tSCNjJS+DOq+BXmqAVMFAEJPMjYob0y8hy7rbNJuMeL7QuEPW7NAeD6H/Ttq+1oCQo5Anuo5OBUE5LT41KJyodoMRvYjJcPM00UqTJ8lz1KQAJcgvFF0XNOLlgEcP022aXiXpsq00Lbs04gVNgPgfNVPzScVpQbFMYSnSct7Zmnc4UTedgBkzHxWFIdo3es+tGmvvHC97iWRZMdmJIW+5IGhm4yMEkKxzdrxYLX; 25:lYiOuc81vZhjriIcolnS2Vstm9vNwiVBgmeq4t98EQQcrABGegYQXmakB4LohBtGSZJyuJ/5EpGNOCote34Lb4DJHm3ynkAQs1NuRbsSRZqsWpAwweBuC1rkfREKbrTIEaZBagowbE2zlnRdkwMeWW5JOE3Lq0sOp/EMypw5UE98Zwx2sqhcCNLuDTv6sVnupVwhab0Mji2EfQtjlgz/BfizlIITjoqRYAf4mu90YXjUVVE//m/ez07RTYbNMut4EP52Zp0xMHt1fm5WBdUYCGK4yP6xP6RdH1wkVM564MSKRnCzEHmZUyjmxuB1Gbe2iZ5M0hmcDKYnVhDdG6m/KQ==; 31:0w8UAwKS7FyAA+WM88kGWvFW8/ExL0uftRBy/NOlMHVfHwTCy+OSBeW9KK/bqH7kYFTxKpZKYMVox9WhaYjUQhm/dFzWyRIuFuUk+jR5a0Gp4z8/0kCZla3+oFyc61WnvKWF8ZOXiSIto8SNwoXtdydO6raPG860uP+pbDivRtRQylDjBgrV9AoNyYMzKV2TLE2LLuxf16abc/PmvX9DHi2lQX6hQv5S3ZCE+agrOlo= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1878: X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 20:wdVgmvzyXrpRweTYJbHwjGpCm2s3nfhERq61Uq7vlcPeaEyJLvpMwXW+Tn98ZJDkAFOzAeM2gpZjmVoIlUP9vVX13ZJlxg5zqTu9lK4cqXid7drpgm31YCQngTxgCu0thr9dzytO/0E/kcC8h7CYuyEdE29hP0v7+avrUsM7OVQCh5X4D0UcJ/tI+IB2LMvUHF3gD/ZeUlWkH6q623dEFiO/FcmrxAxQL5CkUkZPBZFPUnDzjnRQFFdNMdfEmrG7WrjCqKd7f7AWSg+jALQ4jK71RPgrIe9BYjCM8XIGGdB1FrKrXqQLSemlDHcsMpBrrfS/0xQRrMM1eJsQv0TJzmGv7zjTlIb4D7+b1yQhf6YQN29hvQ6KoZlC2UodTbrbGsffp9IQ0Frt3cBNJhAOoUIDUWjDH/+LWnjbaOYMW4qJn0Vy2RGDcIygJyn65O1dt1OaBaLPI/+8FZKAtCp5N1Ca1ZR8UbGDuTV8IcSXtseDBWaxzl0CsirhNaMPjoco; 4:0sHuLoBEOsGvgGutBhLvS8MKymDWPBrmKbZjKyrRBTr69gtaTwJtO9zsCYKKdYfi/wu2zMEqkuVNKLOGnNmseR66yQyfa4G2ZRzqyJh3NTuwpbqMxseGVAAcdnW7SWm7qXvxbyBhUYF6jwGu7HWYp/XJgI5kXEeYoybm6qpuMUtxnU/QitKj7rb2eUdkD0Y5VXOvsClnu3OhluKMsNGdnUmlt4+G93xf2P0ZDKjtUN/ME3XN9Uewy4juTDENkZ6FiEX2VbTAqTw66JCvvlf1vugNvUMYb3X56rtaCtcIsOzZ6wHnxD88086fiZa/p77G X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231023)(944501137)(6055026)(6041268)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:KL1PR0601MB1878; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:KL1PR0601MB1878; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(366004)(396003)(39380400002)(376002)(199004)(189003)(8676002)(81166006)(50466002)(68736007)(6486002)(25786009)(81156014)(8936002)(316002)(478600001)(86362001)(83506002)(54906003)(16586007)(16526018)(53936002)(58126008)(97736004)(4326008)(76176011)(7696005)(386003)(2950100002)(52116002)(6916009)(36756003)(7736002)(5660300001)(6116002)(69596002)(23726003)(53416004)(2906002)(105586002)(47776003)(305945005)(66066001)(106356001)(3846002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1878; 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; KL1PR0601MB1878; 23:C1aWq2oAOMRL+k82pWUZj1OE/7GKDeDLCDY2Gg3?= =?us-ascii?Q?7t6tsH61vdo4bhCktL4woU9pQ0oZm3x4GvLFd+0wu69LJRs6zACx4BrctIHR?= =?us-ascii?Q?LyZ4kIBizUd9q2IEYgB5dNobqTAOs+dNRvpk+gkM3p0Pj4Dx3onWM7spP4YG?= =?us-ascii?Q?srDeD7GiK05KhZjcljligUA3AgvRxxhYLIrFKPweiXHZ60GoEPeOVAvHoAJ+?= =?us-ascii?Q?q+sy7MQCzar5qr5olEwEih6VnCJnIkqfbFLJ1p1/WWxstcIRNmDNO959gKIO?= =?us-ascii?Q?nmndkNEH/Eg0tniC//rEBgiGroH8ruKiw8ATo52bquPubJpYFHN4uxatAVjP?= =?us-ascii?Q?IDqP1/cHNkYSp7sYzrgRhZ1UOCzlSY8uRNclJtngrEJoIceN6AwBPjJPxVu9?= =?us-ascii?Q?3zZFHhl+3/MLq2kCCdzsl/TpvqFx/nZwWJMsZ1o3nk39O8mqaOi8sObQZ9AF?= =?us-ascii?Q?714NU0jyTYj6Azhiru/++zxko2gNgrqjmOmkv1BnLVG+6PBFksvcP6QEaATi?= =?us-ascii?Q?k5Xinjr3CMnQEcIKgtYsDQS8Pl9ZsDNRcO9WuHl3L8PlZK4xqXHXd6dMV2v3?= =?us-ascii?Q?flD7D/9fjcZTcGXCrATn3rsoCJqgZTU5A3YODpyPCZwDJwDJWfMhoGV9kz+I?= =?us-ascii?Q?cyNHmVr1JXlar3nKzIUSNdQXKNXNZLGCgKnR+VOs8ftqtFKIvywmzWV/ZTUE?= =?us-ascii?Q?lx3NvJ3EEEgVx8IH/BwSqvaFCvxcBraR5iHOcJ0acsXHv5K1Bc7DihG5pCVW?= =?us-ascii?Q?m3Zgt18nsmXA4ktmdJjodXRzeV0sZ7l/HRV9JqEaQQs0d23D9gKoluHMWw6s?= =?us-ascii?Q?MPmaHHrSy14A+SVxcX3f6Y6Lvj8u3xvQpGj67Xkvf90C9gSK0hf29X6d22Ql?= =?us-ascii?Q?mI2GQ1q5Xx/gY9/bspB0JmhttpEENvqsxi2PMtnWg2/9RI2yQghKZr1T7oyH?= =?us-ascii?Q?yKMcCE/KVsOxA8hGS5dzMB8YF70axDoTL8Rib/GW5WpLWpy5lF9yNlGV+FbZ?= =?us-ascii?Q?RZA9flGF8+ktlamS94++25EQXc3ebywaP0+fr7YT7M93YA8JVncMVHajdoKE?= =?us-ascii?Q?78P0k31AjNmrqRyP6a54MWw/YgGFZADERZ6z6ojkyPJ55zIu2CaowvLSd+v4?= =?us-ascii?Q?VrP83fANdIes=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 6:A7kYUN2cuJvuz9pNJtL1GBDptjTs84rkFAjhyM2ZwPTLtTJE8b74PIG9YlYJjw/Enmh+JkCiXEQ+CVmwnKa0IVCrwxGXEpbbfho10dLNPRrUoRftThLau/IuXwF7ELrm1BuhVF/92/xwyOo+DOMtfwU/jQ+aBRHYBsFRmbPOQDEqjv4yfNbg+yIs7vEA7IFg9z428Qhl0Bw5Tg5cdc/6DPeDT8johh2m3KgRSVxCSCA/7ygtixhqHqWL3veWhwWfnp1sEQ4oKnGQFWskw+Jb7QYnQPy3rlNagkdZOIJ+1kZdI+j8SxXON68SUF8Ulaqprl1SH6hl03y4AKgl674AV+vl8vSQdcxF867Sq8RrVC4=; 5:Zv8SqHKLYQot6+zv0P9Jk46Tlf7mbpVp/a5jSMQikjb6a8cyFYweKpcADk9EJM0PgeX0nAeWzCzjj3bNi7n8pb8AJ9FqSCT7rWgvw9jhSwcaQos6NPNrscN7RBMy7MS/CywOlbvigHqy/RsbdOCGJITIUxmRQt0y0Zo4Rs6VHxU=; 24:9swGi2uyOyRpCMb4uQ6s4J4JADDDdFeG9AvmIKsweLx+DCpuO8KaOntTVSB+gv9EKhVT04AN+nARrlibjHRAG5eEZzU+Sn5DLtvJJkE7Fds=; 7:Pm142lLypRZeoBN5wJyBZu7zBkXvsyGtAcEmQYoyXLcybwe5HYbgIP8agqpNC5WXwYfhcZiNZT8I4DAo+Q/KwM0ptuxSSe8ixE2h5g5H+Lxwjac6x86lA3NvkNMh/pJmea6B7Y1jdMc7BUj87TdSd//9pS7a4ySiUU5+r0ykxoSpOu9VJtJ8xB5ICgEsfpDNCB6oyy3RgrR7sssWpXZZiwDMHLuDHsEergPAmLSRxq+Nz7ccF9XAV6SGf+HpOkC0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1878; 20:MDAtoWUe/Sy2iXC8lOef7d99BKQpeS+3Yc9KojZzk88/vjcr9YIi10piBEcNiNBONXFcEu0NIIZ8YWSO+08R2g4YPNjxfob73D8ToCDnQKqF/6LOQ2wlHpSSlUkknHxpMZgCepGRjG38hFna3s9MQmvsFLQc/6QLiORuvVo0CaU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 00:45:20.8003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5eb37c3f-1149-4739-b06b-08d55955c275 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1878 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 09/38] ASoC: sh: rsnd: replace platform 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 platform can be replaced to component, let's do it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 64d5ecb..b400766 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1337,7 +1337,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod, } /* - * snd_soc_platform + * snd_soc_component */ #define PREALLOC_BUFFER (32 * 1024) @@ -1364,12 +1364,9 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd) PREALLOC_BUFFER, PREALLOC_BUFFER_MAX); } -static const struct snd_soc_platform_driver rsnd_soc_platform = { +static const struct snd_soc_component_driver rsnd_soc_component = { .ops = &rsnd_pcm_ops, .pcm_new = rsnd_pcm_new, -}; - -static const struct snd_soc_component_driver rsnd_soc_component = { .name = "rsnd", }; @@ -1478,17 +1475,11 @@ static int rsnd_probe(struct platform_device *pdev) /* * asoc register */ - ret = snd_soc_register_platform(dev, &rsnd_soc_platform); - if (ret < 0) { - dev_err(dev, "cannot snd soc register\n"); - return ret; - } - - ret = snd_soc_register_component(dev, &rsnd_soc_component, + ret = devm_snd_soc_register_component(dev, &rsnd_soc_component, priv->daidrv, rsnd_rdai_nr(priv)); if (ret < 0) { dev_err(dev, "cannot snd dai register\n"); - goto exit_snd_soc; + goto exit_snd_probe; } pm_runtime_enable(dev); @@ -1496,8 +1487,6 @@ static int rsnd_probe(struct platform_device *pdev) dev_info(dev, "probed\n"); return ret; -exit_snd_soc: - snd_soc_unregister_platform(dev); exit_snd_probe: for_each_rsnd_dai(rdai, priv, i) { rsnd_dai_call(remove, &rdai->playback, priv); @@ -1535,9 +1524,6 @@ static int rsnd_remove(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(remove_func); i++) remove_func[i](priv); - snd_soc_unregister_component(&pdev->dev); - snd_soc_unregister_platform(&pdev->dev); - return ret; }