From patchwork Tue Nov 20 12:47:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1000449 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Qh4G56EO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42zm041rZvz9s3q for ; Tue, 20 Nov 2018 23:55:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 03775C22071; Tue, 20 Nov 2018 12:54:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 90FF7C220FD; Tue, 20 Nov 2018 12:49:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9C825C21FF3; Tue, 20 Nov 2018 12:49:34 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id 0A3DEC220A2 for ; Tue, 20 Nov 2018 12:49:10 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id c72so956527pfc.6 for ; Tue, 20 Nov 2018 04:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tlg7S/5yavDNw1bG++IXicLM4kjsM/wdZz52Nn7kN+U=; b=Qh4G56EOVVA0q2y8L3tTiISzHQ3gkttdmvDqwDth/8J3N70JKSiACW7qFnECVkYA5k 6vBLirs+XY0t1J8ltT/rkiHpKuFcHfZLvh1oYr9OlDqSZow1jv4KUk4a7WO7gsKVNH9Q 20OHv0rdHzfcGP+0C0sVPlakxSwB6GoxlZQgo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tlg7S/5yavDNw1bG++IXicLM4kjsM/wdZz52Nn7kN+U=; b=etufmszOvDJIj8vDRldHz1JvSLPQDOU10AAFqeG1VMn/h23WK1yVKqkdXZFVfTMJrh o50VzOWD04n3X/6LWlEPHpc+gRT//E2vY0fbwErjtx227KVdB2q3yTMPUwP/VNf35SO7 d6is+1cQwBSs/ki4D1Z7joVG5Ushg3o1WLgWlH9rLOi7Z5aTEN9tw9TwP9MQ9zmefoIj aRFfSjCl+Kkme6FgPvWSmNzSXK5ePpAa2GTdctKSvXzoqv/o1GofY6eGKq7q0treAeTK V/lywK84Nr7vp7PC/pYG84FtQeowG8ABMi3JnXJYg5U4bHIbGPFipTUCKi3GspR+Iuya tqxg== X-Gm-Message-State: AA+aEWY26s7YcKNZgvkRMfKfDQ+VS2+7goK6JP1StxlJDcSLMUw9rB9D hjARp5NBiEECNT2sxWwMZXVkAH44XOs= X-Google-Smtp-Source: AFSGD/XMarMPAKVt8PU6JEb1oL28GAv2OmOFfSVjpmIWxldD40SgviQqFsyMAXRFXAQzBR9SwwojZw== X-Received: by 2002:a65:6094:: with SMTP id t20mr1741844pgu.285.1542718148488; Tue, 20 Nov 2018 04:49:08 -0800 (PST) Received: from localhost.localdomain ([115.97.190.86]) by smtp.gmail.com with ESMTPSA id b5sm34880349pfc.150.2018.11.20.04.49.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 04:49:07 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Tue, 20 Nov 2018 18:17:54 +0530 Message-Id: <20181120124814.23293-15-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20181120124814.23293-1-jagan@amarulasolutions.com> References: <20181120124814.23293-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 14/34] spi: mpc8xxx: Get rid of is_read X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Mario Six Get rid of the is_read variable, and just keep the state of the "not empty" and "not full" events in two boolean variables within the loop body. Signed-off-by: Mario Six --- drivers/spi/mpc8xxx_spi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index ca34570901..962ef710f8 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -90,7 +90,7 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din, spi8xxx_t *spi = &((immap_t *)(CONFIG_SYS_IMMR))->spi; uint tmpdout, tmpdin, event; int num_blks = DIV_ROUND_UP(bitlen, 32); - int tm, is_read = 0; + int tm; uchar char_size = 32; debug("%s: slave %u:%u dout %08X din %08X bitlen %u\n", __func__, @@ -144,12 +144,14 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din, * or time out (1 second = 1000 ms) * The NE event must be read and cleared first */ - for (tm = 0, is_read = 0; tm < SPI_TIMEOUT; ++tm) { + for (tm = 0; tm < SPI_TIMEOUT; ++tm) { event = in_be32(&spi->event); - if (event & SPI_EV_NE) { + bool have_ne = event & SPI_EV_NE; + bool have_nf = event & SPI_EV_NF; + + if (have_ne) { tmpdin = in_be32(&spi->rx); setbits_be32(&spi->event, SPI_EV_NE); - is_read = 1; *(u32 *)din = (tmpdin << (32 - char_size)); if (char_size == 32) { @@ -163,7 +165,7 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din, * in the future put an arbitrary delay after writing * the device. Arbitrary delays suck, though... */ - if (is_read && (event & SPI_EV_NF)) + if (have_ne && have_nf) break; } if (tm >= SPI_TIMEOUT)