From patchwork Thu Feb 22 13:17:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129246 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp588690lja; Thu, 22 Feb 2018 05:20:04 -0800 (PST) X-Google-Smtp-Source: AH8x225BPVeyJJtqaFA9QAG+oJExJXYh2R0d0JybBYXkCKqNe8DybZz7rjuZ92sAPoNY+Kuv1/ju X-Received: by 10.223.163.85 with SMTP id d21mr6426222wrb.105.1519305604104; Thu, 22 Feb 2018 05:20:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305604; cv=none; d=google.com; s=arc-20160816; b=zXW+rRYxdrUPFPs9P+ICdMKpU2/Kety4mhWGz1OvV+zJAk7XXBLafFiQJxGBI5CUt0 /YfClZ1ZmE8JoTh/Eoa0aTwV1/mjWMwFuKlQUkSudzfm6SllP+g2iRjHjW+EGx/jq2sJ P4BEjA2JnRkaPoOuJpz97UVBaWpFv97JdYsEESl0fDcur3nbGdsX3N8xmJu2yB2oPfBr Z3uUBPlOb0TIavzb7CerZeAeYfPvDd1xQWCcdJEKU3rWULfLJrdoeHP8KPXYM/RJTJAf MYnE1s1wkliXzelnDS4hYc3DTW9QapqHe45wN2dGsQ7jkvqRjpjjsPaQ8qR8pTeEITDm PNMg== 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=NZbLAHW4qCUD0P4w1wXLwTGSdrxuw+Wtai/T0b4ZvO8=; b=m1CKoe9syrxJ2MPT3jnIEBDkFH12z8KQIJPn1C2GaabI6oQF41akSIiTtjFKKuQXn6 x7DH3RrDUpjRN3osWgDo0PS8aP/PFeTWVDkkBfYzMyPynqJvkzaXpwK9ImHL2Vud4paE /s6C79MZvg/o7hTusFGj2cpV9T8FBjuL3J0VSRNIaIMZMeekOcB2tXWdt6qzIh022QfK ap/syPDUMaGPfOBYJQwn9sWtxCx8eO0v0tU68Pg4i/V4Ldrh7N7jLdEgi5w/s1uPBXmr j7jmbtZBB1YzjgmVYjyPkfoWv/phN9S58EHjrqF8v5E0LFxDXH3bDDWfAhIYPDni5Tdh NTrA== 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=XuEzC8cC; 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 1si43034wrt.506.2018.02.22.05.20.03; Thu, 22 Feb 2018 05:20:04 -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=XuEzC8cC; 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 DB63B2678AF; Thu, 22 Feb 2018 14:18:31 +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 CD7A92678A6; Thu, 22 Feb 2018 14:18:28 +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 F03642677F9 for ; Thu, 22 Feb 2018 14:17: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=Fi1H5bYyZYWWFCA4AQ5dbRZ84xiGC7wW/BWIlU2CZWM=; b=XuEzC8cChwl2 19Xfw7GTjdkvbfa4Wo31eDpqkBSrm2x1n4Xuu0hCxzlF3t/o2nupIfJ+fhURZGcfnL53aFqnEDWzb DvGxR81F/n2ux8fqM/HAjLox1CVyP5Vcs+7JSjSCIJaJ91A+u5hJ3dcJwzPVaOseuoGyVZuMTNQw4 icfg4=; 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 1eoqkM-0002WV-6T; Thu, 22 Feb 2018 13:17:14 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqkL-0006UU-Na; Thu, 22 Feb 2018 13:17:13 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1515990087-11598-2-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:17:13 +0000 Cc: alsa-devel@alsa-project.org, arnaud.mouiche@invoxia.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, mail@maciej.szmigiero.name, caleb@crome.org, timur@tabi.org, broonie@kernel.org, kernel@pengutronix.de, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: Redefine RX and TX macros" 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: fsl_ssi: Redefine RX and TX macros 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 1476105c3f4a6b8f0c6c1fe07295fc85cbffbd83 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:09 -0800 Subject: [PATCH] ASoC: fsl_ssi: Redefine RX and TX macros The RX and TX macros were defined implicitly and there was a potential risk if someone changes their values. Since they were defined to index the array ssi->regvals[2], this patch moves these two macros to fsl_ssi.c, closer to its owner ssi->regvals. And it also puts some comments here to limit their value within [0, 1]. Signed-off-by: Nicolin Chen Tested-by: Caleb Crome Tested-by: Maciej S. Szmigiero Reviewed-by: Maciej S. Szmigiero Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 4 ++++ sound/soc/fsl/fsl_ssi.h | 3 --- 2 files changed, 4 insertions(+), 3 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/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 24fb672f3c65..3c8dd609e42e 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -56,6 +56,10 @@ #include "fsl_ssi.h" #include "imx-pcm.h" +/* Define RX and TX to index ssi->regvals array; Can be 0 or 1 only */ +#define RX 0 +#define TX 1 + /** * FSLSSI_I2S_FORMATS: audio formats supported by the SSI * diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h index de2fdc5db726..18f8dd5209d5 100644 --- a/sound/soc/fsl/fsl_ssi.h +++ b/sound/soc/fsl/fsl_ssi.h @@ -12,9 +12,6 @@ #ifndef _MPC8610_I2S_H #define _MPC8610_I2S_H -#define RX 0 -#define TX 1 - /* -- SSI Register Map -- */ /* SSI Transmit Data Register 0 */