From patchwork Mon Sep 10 14:22:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146320 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2552475ljw; Mon, 10 Sep 2018 07:22:23 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYflVkc8oWuGHLcUCJU64YnF74wsCYozYNYAKDqH84ej41M/JdUHkZqKSU05EMfHdbLZXtC X-Received: by 2002:adf:d08c:: with SMTP id y12-v6mr15257683wrh.152.1536589343054; Mon, 10 Sep 2018 07:22:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536589343; cv=none; d=google.com; s=arc-20160816; b=NRE3Kevd0Qn2DrRzWHZM0S1pwNyYVxWaZYeCE6eXFXPQq5lHF6ChCurBtkOl0dSwkq 0NOsSeJ7AiShEAFRuEjQwkL/NPMlSgfAItWeIZJ0l3CLSNmlgWxi23k2oTEmsCM4Ymia oHCJtrEz5zdE9IpHEXHAQ+rwmIoR71gs5w1kOssKiEX8tndk45lWrA4oWbjESROrMusY JiYmoaXrRQTcC7pMPKZgobaaArujeehhn9rpcu2ZpSEIh18w23IGT+kF7hc8THNyPGT+ VX2zi9/cSzXODWNTJjq1ROOmZRRpHMIbcx9icsiUiY+lbdje6ICFSuYxF/HXrWlA8a+L lZxA== 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=1U4IUI0qL1USAgrcr1tcE/eljScJaJOyArd1NBl1K6I=; b=ByHz15RcXA9NwZ9w0PfqVuasjtrnomQeyHBeGVps8OcblzZutFGStNnX7kh6g1Lxwr N2dR3ZUxLcC1BihLjTZhcsRJRXkCDd1VKfqcyrzEie8l6fMaVa7FF0FXrYRyhg2WoT+E 5DNxt/nF2RegYDVNx8BDix9Hsacd8TDssUaTHVDn9WOU8XlsVNceh3ZrS3/L9f9qbQYe 9iJ1PnG0u60SdMXnE5XdlqJp2xQzWh+DnZJwqz1fkFHdclwYpCNIZolZd+LT/ZjE7Zlk 8IASbIVtsfqTTPuNcslZYh7ZWmeGUVyB/HXB9NcK5w/9Cz9wPtfIGxyKwF/iGCmkBeIh qB/w== 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=aCOOBMLm; 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 d190-v6si116030wme.74.2018.09.10.07.22.22; Mon, 10 Sep 2018 07:22:23 -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=aCOOBMLm; 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 312F9267889; Mon, 10 Sep 2018 16:22:22 +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 4F3F92678BA; Mon, 10 Sep 2018 16:22:20 +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 391EA2678B3 for ; Mon, 10 Sep 2018 16:22:18 +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=/vEyu0vbRfI1M6qCfv9Lq3StcVBLVhq0xfSrM9xbtZs=; b=aCOOBMLm5Jle oCSOsxqSk1E9tNqFcZ8386oWM5yIEckiaMK1eIME4jRk0tYSH5/geT8X5tNiUQrcft7ZuXD+8YKhj x5a596aE+CVxsErzilv8CDdPLmIqtp9/kS8Uwx+UZBPqmDXHTyVqCtZej0I9RzGyjcGhEsjVRL2gd fqJok=; 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 1fzN50-00024V-2u; Mon, 10 Sep 2018 14:22:18 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id CD0D51122D51; Mon, 10 Sep 2018 15:22:17 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87o9daruub.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20180910142217.CD0D51122D51@debutante.sirena.org.uk> Date: Mon, 10 Sep 2018 15:22:17 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: bcm: 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: bcm: 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 570f75b93551a6d70ecbd0a7b6d962b4ca4722f0 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 7 Sep 2018 01:00:49 +0000 Subject: [PATCH] ASoC: bcm: 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/bcm/cygnus-ssp.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.19.0.rc1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index b733f1446353..b7c358b48d8d 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c @@ -1334,7 +1334,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev) cygaud->active_ports = 0; dev_dbg(dev, "Registering %d DAIs\n", active_port_count); - err = snd_soc_register_component(dev, &cygnus_ssp_component, + err = devm_snd_soc_register_component(dev, &cygnus_ssp_component, cygnus_ssp_dai, active_port_count); if (err) { dev_err(dev, "snd_soc_register_dai failed\n"); @@ -1345,32 +1345,27 @@ static int cygnus_ssp_probe(struct platform_device *pdev) if (cygaud->irq_num <= 0) { dev_err(dev, "platform_get_irq failed\n"); err = cygaud->irq_num; - goto err_irq; + return err; } err = audio_clk_init(pdev, cygaud); if (err) { dev_err(dev, "audio clock initialization failed\n"); - goto err_irq; + return err; } err = cygnus_soc_platform_register(dev, cygaud); if (err) { dev_err(dev, "platform reg error %d\n", err); - goto err_irq; + return err; } return 0; - -err_irq: - snd_soc_unregister_component(dev); - return err; } static int cygnus_ssp_remove(struct platform_device *pdev) { cygnus_soc_platform_unregister(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); return 0; }