From patchwork Tue Sep 11 11:27:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146446 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3526039ljw; Tue, 11 Sep 2018 04:28:05 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb/1dSVMdv8JPJf+ONMHQq2NFxN+S5Sd1GNHlRXgh/zqJT69rnbn9wz9f7k0drTpXGy8EVM X-Received: by 2002:a1c:398b:: with SMTP id g133-v6mr1128799wma.5.1536665285521; Tue, 11 Sep 2018 04:28:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536665285; cv=none; d=google.com; s=arc-20160816; b=q2OGyVBwDoeKT7ageXyxtsHbV3SMxiD/OMN0jZ8DB1htj0x8buoe1IDZ98i+tC6mQl 5mzvxgmaqERZ04d1XqJreHUkMMnMaotEsnAf6e0aiQT22Y58ONyqRUi6SobyxmQtg1Dv UcuDRK/AhCts4WjOzqToZ55GnOkVYDkiaA9icAhK7cAy0Q4EbDS42kt2hQAJtzOmmBSO u9MN1iu0g449UR2Cj1Q0+ubpkOCpU4bTqfuaBNN3aMl8COXOVtqvYlEXZtUHPfCUa1sE GBN06bXMDGwiQYwhkgvr8AK8wMRp2b7kVRjQqejbPlbHwxkaExMIodftchCKY4gsdTf4 yHUg== 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; bh=yPKixmrWmwSG597eGPz/+76k5vD+hrSPazo2WDGrt5c=; b=nx3S2Qllxz++Qv4hkQ+Akxd9oVbwm10OvxPb7CmMTQLL+s0IoXe8zv3vkMhJ6yajT+ P/QSTdwHDsagEYiEVcD6Ff1NHiVuLOqa6ibR0Nm7fAZcxahLw+B6fiL9e4mzxXwYdy8o TdNB/KcgiEdLBREEicTOI7w7tbYx4RGgXINB82vl5rrBY2q0L7oRgw1/vrN5GxqDcOQr EgwaiPy2HB16hCsNiSilxlOlW8ONJbKwc4ONJYGPGW729WXCNEl5BUcoIP/9tLG8kHgC ynKyprMjpkVCmqXGkK7XqrxsCAjNZlPZj3KIypXXdvRdGXpTCcprunZZOrfeqd9OLoeI XXoQ== 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=gJWrCpcI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id y140-v6si552442wmd.175.2018.09.11.04.28.05; Tue, 11 Sep 2018 04:28:05 -0700 (PDT) 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=gJWrCpcI; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 36EB8267818; Tue, 11 Sep 2018 13:28:04 +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 2E93826782E; Tue, 11 Sep 2018 13:28:02 +0200 (CEST) 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, RCVD_IN_DNSWL_NONE, SPF_PASS 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 A4AA72676EB for ; Tue, 11 Sep 2018 13:28:00 +0200 (CEST) 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=lplSJz2c53Ee1Xu1jYrPfCpfEXVuQTJqTeEOKpd/6YA=; b=gJWrCpcIf2YL yw8jYQ+8B3z+GARQMfsIeuSRR8XKyTLrx7rGXQ3tzq9itA7cZbw8kOL5PCiuSvfEE44sZcPajOGaQ Qbxfjo1+ipIZNMFv027T8DBmfz6i1WKUoQhwSH2ZLa/xk1J+K3vJeihHoOpSv3jgFj76i1GgQMJm0 RO6Z0=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1fzgps-0004mX-FT; Tue, 11 Sep 2018 11:28:00 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 01C8C1121AF8; Tue, 11 Sep 2018 12:27:59 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: Message-Id: <20180911112800.01C8C1121AF8@debutante.sirena.org.uk> Date: Tue, 11 Sep 2018 12:27:59 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: atmel_ssc_dai: use devm_snd_soc_register_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: atmel_ssc_dai: use devm_snd_soc_register_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 e14614dc5153ad41f7d1e5b125e4cd155ca79aa2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 7 Sep 2018 01:00:15 +0000 Subject: [PATCH] ASoC: atmel_ssc_dai: use devm_snd_soc_register_component() Now we have devm_snd_soc_register_component(). Let's use it instead of snd_soc_register_component(). Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/atmel/atmel_ssc_dai.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index d3b69682d9c2..6291ec7f9dd6 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -1005,11 +1005,11 @@ static int asoc_ssc_init(struct device *dev) struct ssc_device *ssc = dev_get_drvdata(dev); int ret; - ret = snd_soc_register_component(dev, &atmel_ssc_component, + ret = devm_snd_soc_register_component(dev, &atmel_ssc_component, &atmel_ssc_dai, 1); if (ret) { dev_err(dev, "Could not register DAI: %d\n", ret); - goto err; + return ret; } if (ssc->pdata->use_dma) @@ -1019,15 +1019,10 @@ static int asoc_ssc_init(struct device *dev) if (ret) { dev_err(dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + return ret; } return 0; - -err_unregister_dai: - snd_soc_unregister_component(dev); -err: - return ret; } static void asoc_ssc_exit(struct device *dev) @@ -1038,8 +1033,6 @@ static void asoc_ssc_exit(struct device *dev) atmel_pcm_dma_platform_unregister(dev); else atmel_pcm_pdc_platform_unregister(dev); - - snd_soc_unregister_component(dev); } /**