From patchwork Wed Nov 28 16:05:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10702933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D94A5109C for ; Wed, 28 Nov 2018 16:06:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7E7C2D9A0 for ; Wed, 28 Nov 2018 16:06:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC48D2D9B2; Wed, 28 Nov 2018 16:06:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E22B2D9A0 for ; Wed, 28 Nov 2018 16:06:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728899AbeK2DIK (ORCPT ); Wed, 28 Nov 2018 22:08:10 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:38342 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728624AbeK2DIK (ORCPT ); Wed, 28 Nov 2018 22:08:10 -0500 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=WddPQ876YEPqyxCaYDTZSI9JeZLygwWprc6QI3dJIKE=; b=VLayMreKA6Vc K4qwZK70P1hVuajfWNhqPgfxLsi6ztuj8bpNrlovArB6ZHTZ1SVlo753Ywbe07/CcvcrhUocraBjp XbLGGs/vwPziVrsUgqWgg95VM5gtR95cVWPIk5vimnKOflcau3S1YOocVTE1zhk/g9wimPFt6Rc6y DcaQs=; 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 1gS2Lc-0005xs-By; Wed, 28 Nov 2018 16:05:56 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 0D951112521B; Wed, 28 Nov 2018 16:05:56 +0000 (GMT) From: Mark Brown To: Olof Johansson Cc: Mark Brown , broonie@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, opembmc@lists.ozlabs.org, Tomer Maimon , linux-spi@vger.kernel.org Subject: Applied "spi: npcm: Fix uninitialized variable warning" to the spi tree In-Reply-To: <20181117035504.95804-1-olof@lixom.net> Message-Id: <20181128160556.0D951112521B@debutante.sirena.org.uk> Date: Wed, 28 Nov 2018 16:05:56 +0000 (GMT) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: npcm: Fix uninitialized variable warning has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 1d2319efb6a970d5f5740a60828244e6c309df2b Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Fri, 16 Nov 2018 19:55:04 -0800 Subject: [PATCH] spi: npcm: Fix uninitialized variable warning The compiler has no way to know that rsize 1 or 2 are the only valid values. Also simplify the code a bit with early return. The warning was: drivers/spi/spi-npcm-pspi.c:215:6: warning: 'val' may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Olof Johansson Signed-off-by: Mark Brown --- drivers/spi/spi-npcm-pspi.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c index fed05b02007c..dda91c19af93 100644 --- a/drivers/spi/spi-npcm-pspi.c +++ b/drivers/spi/spi-npcm-pspi.c @@ -217,15 +217,23 @@ static void npcm_pspi_recv(struct npcm_pspi *priv) rsize = min(bytes_per_word(priv->bits_per_word), priv->rx_bytes); priv->rx_bytes -= rsize; - if (priv->rx_buf) { - if (rsize == 1) - val = ioread8(priv->base + NPCM_PSPI_DATA); - if (rsize == 2) - val = ioread16(priv->base + NPCM_PSPI_DATA); + if (!priv->rx_buf) + return; - *priv->rx_buf = val; - priv->rx_buf += rsize; + switch (rsize) { + case 1: + val = ioread8(priv->base + NPCM_PSPI_DATA); + break; + case 2: + val = ioread16(priv->base + NPCM_PSPI_DATA); + break; + default: + WARN_ON_ONCE(1); + return; } + + *priv->rx_buf = val; + priv->rx_buf += rsize; } static int npcm_pspi_transfer_one(struct spi_master *master,