From patchwork Mon Nov 26 17:20:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 152056 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp109947ljp; Mon, 26 Nov 2018 09:20:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/XLMv9dTzPMvXuwvXDh6fEMXXE0kaO/9jm5F+8SVHZ03D2hBR2BkifwxMC7leLYFr0Dn2m5 X-Received: by 2002:adf:bb8d:: with SMTP id q13mr21600274wrg.183.1543252845210; Mon, 26 Nov 2018 09:20:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543252845; cv=none; d=google.com; s=arc-20160816; b=Fh6eztVlaU552McXYLj/CyLTdN9SfgdX7LYUZt+yvbRPU5kxQy2PH0Um6/FoilBdP9 XsXBBYsBXYmClLwUiOAmQDfvwyix9svxYBS4Onih42WZxOjqJei0g9w2cJjpAoB67VOe elaI/kC3d6mIRfiar7ZFsA9AKLUQmq7mQX6zv6Pl76I3B+iroxjN92VroGytUw5xuDfq zOvA2h7E/UnLuynNIj2bL+hD1I/ze0O/j+va2T/q/6+KRcSIxEYzhZGyTc3b9pvu98Iw Mf15lo7EE/0YC3U5RKIvO6RRb9pKs+ic/NDGk23QRN0Xe2igStkpnaVQg45qiW2GK5Vn dnOg== 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=1rBCSnccYz+OqxaBuZLFWqTySJh3mPA3fWgJY/duC4A=; b=pSLR5nvHjg2nUmAJVfuoUIxyxR8FK627h6PzgRZJ8N/cxhragDz6mALY/uPiID5aIn mZoZaH4xZysRONEwbMnb75eP+EIW6OBME6cQ/Uqf2tIheWTdgsEAM56nSWMQ4Xp/1Dnz PdZEmjw63DrFRSk0SezMD3lVL5Ga6c5udReAlY7cpOspCuQxzxExBCADwWQLCxNpajxo 3MfTspA8EXkRI8GqBnzVEsNYMwlr/btvlzH+vP9SD3pYX+GzphUI2LPlSAB2QlOJhudh d/DNXK4JOcX7k1aXvA9mB9q/xxsBPH0p2UZgADvQcppHZt+3/sDnJjFgmcPP139wIgUl HcFw== 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=I1KSd5az; 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 z16si729891wrn.209.2018.11.26.09.20.45; Mon, 26 Nov 2018 09:20:45 -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=I1KSd5az; 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 E3A89267AB1; Mon, 26 Nov 2018 18:20:43 +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 2D56D267ABC; Mon, 26 Nov 2018 18:20:41 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE 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 C70CE26770D for ; Mon, 26 Nov 2018 18:20:38 +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=c7ZWE+L76jEj81BNe62unOzFmnI8Hucqa3weJmcge18=; b=I1KSd5azeC3k Gh02ONzu2KMFphAKSYDnU4nk9J+9C87+0lWuDezEFTPPIccRDXxNCMe08sunUPYZO0+ImdepfD5uR T3hj5PnjKxzJOPDW0hexfeEN+GZqLwtcGIYRDCuRBUdc5DqwVhdnT0FkYapz1ymxCloH0toRKm+lY eQZhg=; 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 1gRKYn-0005TI-25; Mon, 26 Nov 2018 17:20:37 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 87D5C112519F; Mon, 26 Nov 2018 17:20:36 +0000 (GMT) From: Mark Brown To: Ladislav Michl In-Reply-To: <20181123142700.GB7347@lenoch> Message-Id: <20181126172036.87D5C112519F@debutante.sirena.org.uk> Date: Mon, 26 Nov 2018 17:20:36 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Kuninori Morimoto , anish kumar Subject: [alsa-devel] Applied "ASoC: max9867: Fix whitespace" 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: max9867: Fix whitespace 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 933662f28981cf8520a814e47acaea53061ec894 Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Fri, 23 Nov 2018 15:27:00 +0100 Subject: [PATCH] ASoC: max9867: Fix whitespace Minor changes to match coding style. Signed-off-by: Ladislav Michl Signed-off-by: Mark Brown --- sound/soc/codecs/max9867.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 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/codecs/max9867.c b/sound/soc/codecs/max9867.c index 4ea3287162ad..1cda54b59854 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -283,13 +283,13 @@ static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, /* Set the prescaler based on the master clock frequency*/ if (freq >= 10000000 && freq <= 20000000) { value |= MAX9867_PSCLK_10_20; - max9867->pclk = freq; + max9867->pclk = freq; } else if (freq >= 20000000 && freq <= 40000000) { value |= MAX9867_PSCLK_20_40; - max9867->pclk = freq/2; + max9867->pclk = freq / 2; } else if (freq >= 40000000 && freq <= 60000000) { value |= MAX9867_PSCLK_40_60; - max9867->pclk = freq/4; + max9867->pclk = freq / 4; } else { dev_err(component->dev, "Invalid clock frequency %uHz (required 10-60MHz)\n", @@ -478,8 +478,7 @@ static int max9867_i2c_probe(struct i2c_client *i2c, struct max9867_priv *max9867; int ret = 0, reg; - max9867 = devm_kzalloc(&i2c->dev, - sizeof(*max9867), GFP_KERNEL); + max9867 = devm_kzalloc(&i2c->dev, sizeof(*max9867), GFP_KERNEL); if (!max9867) return -ENOMEM; @@ -490,8 +489,7 @@ static int max9867_i2c_probe(struct i2c_client *i2c, dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); return ret; } - ret = regmap_read(max9867->regmap, - MAX9867_REVISION, ®); + ret = regmap_read(max9867->regmap, MAX9867_REVISION, ®); if (ret < 0) { dev_err(&i2c->dev, "Failed to read: %d\n", ret); return ret;