From patchwork Mon Feb 12 12:31:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 128006 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3165750ljc; Mon, 12 Feb 2018 04:35:29 -0800 (PST) X-Google-Smtp-Source: AH8x224uvH9cuMuk3aH7192cJPXhg2pCLqInHbIR3IwTzAuiZ6JwBPXjZMfofBKO3KQoybUZZ/Am X-Received: by 10.223.193.65 with SMTP id w1mr10552594wre.88.1518438929705; Mon, 12 Feb 2018 04:35:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518438929; cv=none; d=google.com; s=arc-20160816; b=osPmJFwK0QtLDBkOel6d1G2Bs9Kc9btMdmjc300lU9nRo10H51n+RUgK7v49BiUIQy /edzDx4hdJd4+kdnwd6R81nvTHxXIZp7ybAHKv/YwwgIoDkHfYL2WqdySdJ/3KOnpRPl uQYW0aiUCXc23YQUJUJpayOTV5bK9KhIyqsJ/s45TKvI0E7RBBiGOJtW51dKWLHQatZu XroI5MxsjmjtnXRaEyBpjIq3UPW9I6rySg39luPUnqu72OyuWfpOWrWYRcLxXivmzeNM NpKMCF6r7zzqWGN5JLwUentkydnxxvk95ux7hsQ36JvuDlPjb25COEX7xjjQzMMKrDuy N09w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=bzZ7f+u8MH/1/XsnkdkwOd+8nBU/Cp0z5XTz1Etgmlw=; b=Nqwj2yNmOE8jc4kIX6OZfQ5vjqrY+0Q+10zAdM1LQRcuA4qFDRrjGKNnX1pJYoM2IU EhkihPKI2TKzwN1bT7uz0mt+j/dzdrsHSIxYPzaZlH3QxOyQNXau9lfhpnBjFU7UgB+6 Zsj36QqWFTvgmCXgLL5zg6P2S2dKPb7YK80WqwvuMZue85IFa1X7NnUb6IHOHoXB4Pjq k8ghVW+yggb4kNPSwHWmXBpkPNu1AFiNwT+eDBigfHFy3aZHkh5RGTN3WoJ6BMSp3MZU s+Q60V6IyZc+SJK+zOJM53MxTefiSjJsEISU50re4J3RD0weZwGAKNo0n2/bWXhS8+s7 IuuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=WSRu9dtW; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id n81si1903020wrb.68.2018.02.12.04.35.29; Mon, 12 Feb 2018 04:35:29 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=WSRu9dtW; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C344526783E; Mon, 12 Feb 2018 13:34:43 +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 54C4626758D; Mon, 12 Feb 2018 13:34:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 996CA26783D for ; Mon, 12 Feb 2018 13:31:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=hlaeB8l8jaKbOBffCBdTOOljm6yptFSZdJQDu9HmPI8=; b=WSRu9dtWwg8L sQmsK0pzpKqE6PumxuOGXaqwLX+xRs+y29daRnakbJQxHt3+hIGVSKBwETZVBk0ZMYIzBhm2sx45O 7ETZvC7N5HiOcpRNXCUgeJWoTNo31rFnowQZLhK5oViJK8Q19tyqB//L1BSA85YdDehDrfPAASyjo 5Pr/o=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1elDGT-00021Z-5o; Mon, 12 Feb 2018 12:31:21 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1elDGS-0003KA-MU; Mon, 12 Feb 2018 12:31:20 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87fu8ozj7k.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 12 Feb 2018 12:31:20 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: sh: fsi: replace platform to component" to the asoc tree 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: sh: fsi: replace platform to component has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f5a82fa6016ad1c2a3f45a4d44eab2ac48daf130 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 29 Jan 2018 02:43:26 +0000 Subject: [PATCH] ASoC: sh: fsi: replace platform to component Now platform can be replaced to component, let's do it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/fsi.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index c3aaf4788557..3bae06dd121f 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1764,7 +1764,7 @@ static const struct snd_pcm_ops fsi_pcm_ops = { }; /* - * snd_soc_platform + * snd_soc_component */ #define PREALLOC_BUFFER (32 * 1024) @@ -1818,13 +1818,10 @@ static struct snd_soc_dai_driver fsi_soc_dai[] = { }, }; -static const struct snd_soc_platform_driver fsi_soc_platform = { - .ops = &fsi_pcm_ops, - .pcm_new = fsi_pcm_new, -}; - static const struct snd_soc_component_driver fsi_soc_component = { .name = "fsi", + .ops = &fsi_pcm_ops, + .pcm_new = fsi_pcm_new, }; /* @@ -2007,23 +2004,15 @@ static int fsi_probe(struct platform_device *pdev) goto exit_fsib; } - ret = snd_soc_register_platform(&pdev->dev, &fsi_soc_platform); - if (ret < 0) { - dev_err(&pdev->dev, "cannot snd soc register\n"); - goto exit_fsib; - } - - ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component, + ret = devm_snd_soc_register_component(&pdev->dev, &fsi_soc_component, fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai)); if (ret < 0) { dev_err(&pdev->dev, "cannot snd component register\n"); - goto exit_snd_soc; + goto exit_fsib; } return ret; -exit_snd_soc: - snd_soc_unregister_platform(&pdev->dev); exit_fsib: pm_runtime_disable(&pdev->dev); fsi_stream_remove(&master->fsib); @@ -2041,9 +2030,6 @@ static int fsi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - snd_soc_unregister_platform(&pdev->dev); - fsi_stream_remove(&master->fsia); fsi_stream_remove(&master->fsib);