From patchwork Tue Sep 11 11:27:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146445 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3525235ljw; Tue, 11 Sep 2018 04:27:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaeVQkG4LkBWz42ttZG7jWjn0A4szKjaz+jd5Zkf+frOaZ158aTXDASbbI6KsveU8ZgPLKU X-Received: by 2002:a05:6000:81:: with SMTP id m1mr7410809wrx.28.1536665228731; Tue, 11 Sep 2018 04:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536665228; cv=none; d=google.com; s=arc-20160816; b=an2eSaAr2N/kiCVewge66VArbM3okl01jjngVEtpo56ydqwMC6BMA7TTXw0r42wZw8 rg24fH1s+jeRvFO2fZj/eNl+ba3TuEX5/2kssj8crwal9X//RBkJFOiAmjq1hLd9yyGF S0dzN9ArtigsaFNogTvjnZi5ssBJ5rRhacL+J5kMujZeoUXSkr5v471MOLN2Y5AM0U1d EuOhfBnM5qtK8j0rOKji48DO2NDxk1ws4ftOcXRLhPhbontnUgHOJMZ6kNrsvMSfoUaG rnSLt0XMyJlmkvbDQ4fSgBUTFVAMGgvLNHhij1zQlutVs2/ZmrfFmtPiJmJkjSR/HKwj 0NzA== 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=j1UPrL0H62UoSYKqMz1indH1DlRtkEyLcu1TZMwOugM=; b=Xhi87O9ruoSTkFsIXhqxdbGGWMDz5+2QyeJye4SxsgdqVSzBHQIxkEmkHEJI3cJA/j O8++5XBQM17Hot8iBjNlSNtWdZGskw/b1pghmoEIzieSN+GhNrHKvakFhtDouLbob/GL 4KiBUmTQX9EqlqJwGBXqgZ1a6hiqM+L3EJmceoHNPP+LdMcruVF15GXHy1kBDUZ3Z13b ewvdyMCGpNvyJHYXKMojvTBdDFC833ouh9P6UqeinDLNVoRp0AsSMEid3tAhDr1QoM/l UJ6+kyxejlkY6zN6GofLNoce4jDYLIUuuttkETrmZpOVWLISuELLj8P7aEeHTlF2N/+N XTiQ== 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=qUpodgrb; 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 e75-v6si552118wmd.184.2018.09.11.04.27.08; Tue, 11 Sep 2018 04:27:08 -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=qUpodgrb; 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 CC843267806; Tue, 11 Sep 2018 13:27:06 +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 653EE267818; Tue, 11 Sep 2018 13:27:04 +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 C60222676EB for ; Tue, 11 Sep 2018 13:27:01 +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=8uuGr4Rb7XWbgWig1kKjgB4k8onH6Vzd1c7eNRWDXSo=; b=qUpodgrbwPnZ zJLInWTimGyCTUOtauKwsn1+4UtREPcaahOYsmYy4e6j6ZjUF5udTWF/0C1VQ0L4DqUAYNJv57M8M uM5qJ6z2Tp0ddbLmNRG9ctvum47II7I6tz2zgjWiL8vYuLCM+fPeY/SQzfh3birRtdkmMf8q6dOJF gojbE=; 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 1fzgov-0004mP-Kd; Tue, 11 Sep 2018 11:27:01 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 5A9CC1121AF8; Tue, 11 Sep 2018 12:27:01 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: Message-Id: <20180911112701.5A9CC1121AF8@debutante.sirena.org.uk> Date: Tue, 11 Sep 2018 12:27:01 +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.rc2 _______________________________________________ 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; }