From patchwork Mon Jan 29 02:42:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10188727 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 817E9602C8 for ; Mon, 29 Jan 2018 02:43:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66E3328796 for ; Mon, 29 Jan 2018 02:43:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59FE128798; Mon, 29 Jan 2018 02:43:56 +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 A87E428796 for ; Mon, 29 Jan 2018 02:43:55 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5368F26768F; Mon, 29 Jan 2018 03:43:54 +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 BCBC926768F; Mon, 29 Jan 2018 03:43:52 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id F31DD267358 for ; Mon, 29 Jan 2018 03:42:57 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 29 Jan 2018 11:42:56 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 2A8046D4B8; Mon, 29 Jan 2018 11:42:56 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270905066" Received: from mail-sg2apc01lp0247.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.247]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 11:42:55 +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=jZX4Cgfwxot6JVi/vHy1ED6EX0iiLvM4gm5AsoL8+jYIBt4qZpsYn5E2Vtg8l12rTwtK0QBIVwKEgOF+uXoVeIrd4s/ju62KllAY3IVw/I4NztS1ZfmP1JoLNUVo+KfR+sKyxoBGizC28yBGjZiTZSqkDQEyugtjido8hadJhbM= Received: from morimoto-PC.renesas.com (211.11.155.138) by PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) 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 02:42:53 +0000 Message-ID: <87r2q975ew.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: <874ln58k4s.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <874ln58k4s.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 02:42:53 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR0201CA0024.apcprd02.prod.outlook.com (2a01:111:e400:5971::34) To PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2c3b465e-cc47-4ea5-5ef3-08d566c1ff0c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:PS1PR0601MB1881; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 3:jDBlNs1jW6c1wgDh5Qf6JkY59LYShFhbB/xit/6FgRFychqCQpHupegeiRWnfHFVCficHrYsTF2qEPKyTNjnqGAUy29iDJJgOuqViATttw2k7MyUC1n+bEp0nC0KYvuBJLG7tPG5eryOxCdDIyNYZSLZaXQPhk8pbe890Tcb+KgBSGHPQhQNkNwcnvQz0BQIhAdKQGfq7W1cnW/eg6MrK/pJsBoAfrnxhOWIJ+nF+XY6SAC6sSd46bzDcNCxxgG2; 25:Ixif9fq4XLCuVk9lSYtMKeZAKTFWQGYL4VyhmhyxjKIuZteRlKPi1pSwXEQVXq6zjhLMYWZ5ZVksd7uKUY9f1JPnI5zD5cZDh85saDNw1RtUcA0zpWWFrqJkPkebxl++6AhVg+drLezdMlVTJqEYsneknZKamK9uYxfPu61QANfwgOCenMQH2rHFeNaJoJrr6zFfReLbIfy0ODWFKg98zVdHuFSgaZtrqm6SDlDNYBzJAVsZ1kIT1NU8q+WB6JkStpwoul6AkMB8aiyoVhkTSfkljrPd2yi/2ejbNAR7SixbB1bnic/f7nT6z2YbW5yODLBM9uvcLoto8a7ACKm6jw==; 31:k9PcakH0793VeSabEn+9QrOg2Bte4JE/otEPfoIhmf/Ex23P1KiCGB5aRRu8mt+mKpqm6mT6IvdnGjNTFNTDuIbkLPJQT/dr+z8HPnK0HVzYj0i09VLzs9BvVz4vrf3VDZiymwiq5q+DU1jURerF1mcIrdQ8fg3tYPYVyQmOhbpOzmD3gWZ1ozpLspslaEQRw05OeAoJvqNvReLfvkC2nZ/MV8C+AWgOz3zaJAUJ1VQ= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1881: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 20:xQERf4fSshTHTTCHHRT7QbZttPPXaVwQ+WM3llYC8EggFVSxZIbaRS/PVwWqlHkRSxb7PB2GgBEUKLNdfs6acnnSKvStnbPaIJCIzY9uMTw6EFzN13KfCQhz7o1HYFkjQVefcTrp9rrQQKjdZf98u30pPAQhZjMmlZJoSTGTLf5wESi2Cn9VLI3qktsyfR66zoZNHpjRKQJrqCaBHRN2m20uq5s94KF7DUsqdgLzsMsjavxFhUc1hUgIATUYNEUlQaDTReGAx5z3I8AOdpJNeiDTJkM9vqGNgmsTC4b12hGB3sCk+TOSQr0VJtXcDnR9N0BYLGftd8MJaZ/1RSIGQwkgVA496dPsX4bFkb6mo06mSP5vkqDwFTSgE1XtIP7uB2w+34/F0Gzoq2CilLNL60AasxhwTKvUoixWuk0XCHXcAIs6VWbhdPQpP3x01vy2M9g41RXEDwEOeXh3nXFUWksVFS7Okvij03WSOdb3TAhR4wmE+zRQhEbRBEQeJkhV; 4:6HKgUiFQNcmCriK4xlg1dHgCglUByuZQV4VFxzcU5g3SJmT6/958b9p2y8wVT2h4UyY/TDpfDCxegvm+FzV7hhF2GttrM957P2HDxc22I8gCyyxyGbg+l4H8EDh+sEbsKDLVjVyxaUYbdY0vUZ744R+/SR7MasI+9gv7xadNexfg31D0UlNESS6YTOycsyP73cLcX9EB7pfox5CpHOA8hWKWksnZf2/j/0pk9ESSz5zNt7j4u+uBvE8CmRom+4GEryHsOG63yT7pwpQNkVkFrB2lBvL4vAmV7bfjVh+Ggz3k6JEi3FCXJJ1QoEX5zOqd 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)(3231101)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:PS1PR0601MB1881; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1881; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(396003)(346002)(376002)(39380400002)(189003)(199004)(6116002)(50466002)(6916009)(2950100002)(7736002)(6486002)(53416004)(47776003)(25786009)(386003)(305945005)(52116002)(2906002)(7696005)(3846002)(86362001)(16526019)(68736007)(4326008)(23726003)(186003)(26005)(83506002)(106356001)(8676002)(81156014)(81166006)(8936002)(16586007)(58126008)(105586002)(69596002)(66066001)(36756003)(76176011)(53936002)(478600001)(316002)(97736004)(5660300001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1881; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; PS1PR0601MB1881; 23:QY2ObOY+5O+iKROhI4pi5G4pnfKrcSrCuraJu4I?= =?us-ascii?Q?qbOirXa6qgKFr5OGCsEUw2xEQ8Sj688909qkkB40tQRED3gR/JCjSbej1UZy?= =?us-ascii?Q?BTMWaj/EjyIJrvAEng9spSt+mnPATSDyJ5CMnEmquk82Ibqc9llcqNeZWIvv?= =?us-ascii?Q?TGTGCyq8h+mOjNS49J6RBpj856ls5Jwn2EW0Q90JLYs5WH8KtADJO2hATxvT?= =?us-ascii?Q?6r2XoAzg5pUAJpRsDLEHf3PbpZpoyr7URakWjn/bM1szLdifqcizTc1W6hxz?= =?us-ascii?Q?fb6xcMTn5A/SmKRkQbmnGxUMwvT1U5s9DZBhWtLVj3n0bi0P6hbpG9DdanhQ?= =?us-ascii?Q?4wOLgm3HiN7nUW43oWkRcOsIixZN59ZUmmJLdElB8qbx1WlmjhHHTHWMccRN?= =?us-ascii?Q?Y8Uxy1JXpdCzW6cFSfdXSBtFF7hGKSBkRQjRqvahvXEh6viebUW6cS7vRiOK?= =?us-ascii?Q?D7f4bVVdpfeyM5ozlUESyB2/PpJ82K7ZOnTX5jUBeL75tD8oauw1wWYQIj0D?= =?us-ascii?Q?DLVrRhQvdrFqH5juFq2UhSp0fPzoLdLKHeWh3+tAPdsxvM3CHqx+nMFqnDHf?= =?us-ascii?Q?cUotte/jG2GIpSbd+9ElhOJgBy1WWRNAosmYGHYy54EAqnKp2BsDaF88u6HE?= =?us-ascii?Q?7w6RSYFrmVItEsc1jLT1ZhpoMynoDj3BuN/ANtJ3Vt5sS/mDdLODW/6cfVdx?= =?us-ascii?Q?i551tkamgJDuoGa+QzCAS2bUNojviC5HnjQm2XjEOfZctTKZ32nVKQIKIsjX?= =?us-ascii?Q?6WUmRI6zt5tInzZmtfWzWeB9Xm5PpYWpS7uEIiZHXNmptAc/osYRsBgRJX+s?= =?us-ascii?Q?h8O+1dDXhEwX16+MlrxEEnOWPGH2U5n6xW7u2NinWiSSKRZVH8s7buuEDpga?= =?us-ascii?Q?pbVflXbKgYZxwrAKMk0T47FgNJYo1EoK8LgJ1aUzYWos794jx4dju9qvhaup?= =?us-ascii?Q?qMvx079MKTTqzcLz0HnCt+N9jt6+9Gfa1iXMmEbOJCFalgveSp6hMpWVQ7t8?= =?us-ascii?Q?lxFBapuPg1bT6ePNLvNNutD0jCfkvjSNui6XYUxqN2egLPf4MExBeJ93/8hq?= =?us-ascii?Q?OOc/L6Y9sBARSdkgRIj6UoVo2f5fCbeUmdTnEx24aqUox0eNpbGV53BmxrV8?= =?us-ascii?Q?D+8Pi5jckgJvCXJyYgw7UMcmW+Mdm3mh0?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 6:HA9CyLTXayAxbWlfg0X/TEjLODCpw+flpKTv4pK5qTtBxNBRisNP8L8XR81boIBpm0uGLQwmyiZCFNpTrYnRnUqYmluQTxhPyQWkC5T6dpYTwTDpxZwugT6YlM6WvVANOfzVgWfnD29tcuIm0mCABTzUeheMh7ouZrEiThI8pQs3d6UBS+vLlPMDjIYWwoMFaJ2FPJSBTh2jaURRAYcl1Wk0b7Wh6LdQbgf5mJr5wrn+V2ZrMGrs3S8bK5vGtLBEwDz+LW0mhZn5fMpX0DltOL5eazbx77inAmVbR9M8aTbd2RMdXvY5CW4jWleelEUnmKKu8l1dzi7J3LfFEDZKqUfJK44pU+EiDRIBY3lhPf8=; 5:IEoQ4yhCXXvcpKs5DJtIdnmQjmRWXzoOoNIdKjGjt2+MMiL5UtIiYiIyjonzhUnMDTVmUwSR4wRo7gR027V5g5HZdQggjSf4SnaxyZMEMBXMEuHqinT7r0K5w47PIRTa4896bACw/Q37zLnYYTXl6lvy5PE4GnG2v2h4kvYfIjM=; 24:l3biQ59GIbPJKUJB+ApPaB+2OYo2Py14CBaTw2pA18zwGy4dXt/IX3nVJMIONpOjJEIJ3XZQVHOAAMXZxGZjWVruMTRrfCdpGCJuKNPKNRo=; 7:SXzSBAhnYgnoRYlcHoFPmkjYuMUk6uZl9l7ypNUdo4k3TcGCVWT/DJn0WWzGc0Os5XVIe8ZM+mS0wtjEVpgcs5kdR46Gn3tk/FBoCEqjNZtjMREzPfvfysJNgpRl0GCKQ74m/zkv/wWeT4AnuRDwy9DT8gOl49VTTwNzWwdGe2eSe7kExAB6HcG1aDV5lU/LLObZvOb2Mlmd8SG6m5c9lENVAxz86M/T6Aigd2y2Ph6d5P6bQ2EpFXgGUEfKk6Me SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 20:y4hUaZEaKTQ3rGoA6hrjvlbwmqSiCmo557olC9ti85CooKwKVjgrXXARuzwxg9GYctqu/w8jbhZZG50RvjJ32nTl9r0tgS6M8uGV/RiDR0+bTlTNzTFvMZZSiUPtVBLnKXYzRoXJFdNmkH3OsiAIX3nuUeuwV2X90vbLsBkUD9Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 02:42:53.4327 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c3b465e-cc47-4ea5-5ef3-08d566c1ff0c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1881 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 09/39] 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; }