From patchwork Wed Jul 26 14:17:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 108773 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp882644obm; Wed, 26 Jul 2017 07:22:08 -0700 (PDT) X-Received: by 10.223.139.3 with SMTP id n3mr1023361wra.249.1501078928452; Wed, 26 Jul 2017 07:22:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501078928; cv=none; d=google.com; s=arc-20160816; b=quHxKRB/plweYnzqckkYJ1KVlMGRhJMKudl4hzLh3KvPSdh2QqSorfBesEfmKrLE4T ydcCakEm+EVwv9uY3LobEfzIkZ5PPi5+lonVK005gn3I98W131G8X1BJ+8fhRiKM2peB ipVQ1wWjcL0cVw4V92B4B38SdOwJfY26JAyLndvxqNDrD4sb3OKgsIy6l/HJ/FxsNAaO 2lFRw5z1NdvZ062rLpQfiRC7CwrEuWltPWh6Ax+VXvmuPVw1WoS9qWiFrO8uGC+kJmq3 cwF5pcWzuSdQ/8M6d8zPRQzAVpvXKCwShm7pvyzH+f2dgGtr6439mjfiNXHcKPDhq35k MSwg== 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 :delivered-to:arc-authentication-results; bh=cII8wbKyfQ4U22g97gyWYFucNPw7H164VrWuK0x7oY8=; b=Cu7e1/E0UeWIDlEzXu4tjxwgQRngyWYXHoVwDp7Y0+JwPUR9auWn9oO2MiQwf0yfwk fVOfaAbdkXmIRUYTNbB/uvA9EwBcbNVMkPsbjVUGv89hajFW4uN2lQrRBXALPshrhZnY BaRKIvoKpVehRYlEhL5goSMmUUSGY+U0kV78LKKWj9qzfuQFZKlkCh7jP6O1PfoPQPXY 1n5t6rZj540DMYsVhvRvDHRgdoFwB/YNNqP3opX5cG4J8UQ8EnX4CVgtZr3pDLXQeX2+ VXmu3zVswWIiSY8mElu8Vp4OQYREw0Eo0SfcwoN9IotgBLUodTb06VFaaFRwOWU5Nyt5 Uo4A== ARC-Authentication-Results: i=1; mx.google.com; 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 l3si78259wml.168.2017.07.26.07.22.08; Wed, 26 Jul 2017 07:22: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; 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 D595426758F; Wed, 26 Jul 2017 16:18:39 +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 0A05926758B; Wed, 26 Jul 2017 16:18:37 +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.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 3853B267501 for ; Wed, 26 Jul 2017 16:17:50 +0200 (CEST) Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1daN8D-0000gc-9Y; Wed, 26 Jul 2017 14:17:47 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1daN8A-0003kl-SR; Wed, 26 Jul 2017 15:17:42 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87379mxro6.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 26 Jul 2017 15:17:42 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: linux-renesas-soc@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: sh: hac: add missing "int ret"" 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: hac: add missing "int ret" has been applied to the asoc tree at git://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 295c5ba4c0886b7d55e229218b077fe3510b0ccd Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 24 Jul 2017 06:47:59 +0000 Subject: [PATCH] ASoC: sh: hac: add missing "int ret" commit b047e1cce8 ("ASoC: ac97: Support multi-platform AC'97") modified hac_soc_platform_probe(), but "int ret" was missed. This patch adds missing "int ret", otherwise, we will get linux/sound/soc/sh/hac.c: In function 'hac_soc_platform_probe': linux/sound/soc/sh/hac.c:318: error: 'ret' undeclared (first use in this function) linux/sound/soc/sh/hac.c:318: error: (Each undeclared identifier is reported only once linux/sound/soc/sh/hac.c:318: error: for each function it appears in.) Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/hac.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 84c51037a7d0..624aaf569fef 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -315,6 +315,8 @@ static const struct snd_soc_component_driver sh4_hac_component = { static int hac_soc_platform_probe(struct platform_device *pdev) { + int ret; + ret = snd_soc_set_ac97_ops(&hac_ac97_ops); if (ret != 0) return ret;