From patchwork Fri Aug 21 09:10:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nastya Vicodin X-Patchwork-Id: 1348991 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=H7sYUR1e; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BXwjq2h7cz9sPf for ; Fri, 21 Aug 2020 19:11:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 13811823B6; Fri, 21 Aug 2020 11:10:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H7sYUR1e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC641823A9; Fri, 21 Aug 2020 11:10:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE092823A1 for ; Fri, 21 Aug 2020 11:10:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vicooodin@gmail.com Received: by mail-lj1-x241.google.com with SMTP id t23so1079595ljc.3 for ; Fri, 21 Aug 2020 02:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VJB4TaujYzO9XxdHH1q425C2FUw8TVu69UU8Z1R8z0I=; b=H7sYUR1eRLznJHemgu3j/h9B4vf/VHuzelfkGTWuBDUDcWhfUB3qOUAIg+4Bf01rho RXo86ndOiUbg1NNx6xm4vfHmUyy9+9LJkaG6JbI7Fp26XpTClQGcM4BYvv0VFheubR4p U3fjNwPC9I8CR5FzwXyHY4ncjYHKY23KItlc06CNB9SWajrKf8S+U/KxAykEkGz9lLA5 emAM8MdzUayulOa17sjOf0pzNjjsWlZOeR+oQUe7jhywbhFKq23iCOzplF1fxYTx8v/5 FsO/CUeu+0LYV4OXDFt53zbXmPCnjnYiUOkyo7dEFM0rZDwEHurstC1S6w5SDQsNrkIY WjeA== 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; bh=VJB4TaujYzO9XxdHH1q425C2FUw8TVu69UU8Z1R8z0I=; b=YSZdMTK+ORwHkrv9NsFHMFz4xp1fyCgrT0i4nsNcqaG+AE12lmGEeKhe04CAvPE8iV rQTtM7P/dJyriM5YO4DVYP2Nv2SAN4sAO969vV0K49KrZWtRAPuoOeR+ZvGmstaqn4iD U90eyp3NDP7CSmKowD8j48oZKWOrtjXBUtObi/NlD9itiRivgq/x7fT8JjnslkR1Sbk1 +OAeac1LT0TnXynFVRyyM7vo0CT4vK8ELcQx34kQxWb6jmjOYTZVeEU09wvRLjMLW5CI AA8Tx9lQU/1d6U4QEe2tv7VUvxg8syOLnBcn5xWb1HMtTMbJ62X+dqcJSbPfqQYvCmY8 acBQ== X-Gm-Message-State: AOAM533lCqULweymMc1Ml9NyU3S1N0PvAzPpHW3icnbe4mtewIxgBLMG 9AZbcXMhptSW2L3j3KeN3BZB8lX1PBQ= X-Google-Smtp-Source: ABdhPJz++ePrUzxomb3VLCD7f3+sydPDffrV/kR8ZjQklcfE0AUdSe1AVKugz+cL8kDHStIrXgLH2Q== X-Received: by 2002:a05:651c:1349:: with SMTP id j9mr1037104ljb.392.1598001014827; Fri, 21 Aug 2020 02:10:14 -0700 (PDT) Received: from localhost.localdomain (host-176-36-213-80.la.net.ua. [176.36.213.80]) by smtp.gmail.com with ESMTPSA id t16sm275102ljo.27.2020.08.21.02.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 02:10:14 -0700 (PDT) From: Anastasiia Lukianenko To: u-boot@lists.denx.de, sjg@chromium.org, ye.li@nxp.com, bmeng.cn@gmail.com, xypron.glpk@gmx.de Cc: julien@xen.org, sstabellini@kernel.org, peng.fan@nxp.com, roman@zededa.com, volodymyr_babchuk@epam.com, andr2000@gmail.com, vicooodin@gmail.com, Anastasiia Lukianenko Subject: [PATCH v2 5/5] xen: Code style conformity Date: Fri, 21 Aug 2020 12:10:04 +0300 Message-Id: <20200821091004.23511-6-vicooodin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200821091004.23511-1-vicooodin@gmail.com> References: <20200821091004.23511-1-vicooodin@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Anastasiia Lukianenko Cleaning up the following: ERROR: do not use assignment in if condition #281: FILE: drivers/xen/pvblock.c:260: + if ((err = xenbus_switch_state(XBT_NIL, nodename, CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err" #52: FILE: drivers/xen/pvblock.c:298: + if (err != NULL) { ERROR: do not use assignment in if condition #176: FILE: drivers/xen/gnttab.c:103: + if ((flags = nflags) & (GTF_reading | GTF_writing)) { WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 #329: FILE: include/xen/gnttab.h:1: +/* WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead #330: FILE: include/xen/gnttab.h:2: + * SPDX-License-Identifier: GPL-2.0 ERROR: do not use assignment in if condition #630: FILE: lib/sscanf.c:558: + if ((n = inr) < width) { Signed-off-by: Anastasiia Lukianenko Reviewed-by: Simon Glass --- Changes since v1: - cleaned errors like in drivers/xen/pvblock.c: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "err" - added commit message drivers/xen/gnttab.c | 3 ++- drivers/xen/pvblock.c | 12 ++++++------ include/xen/gnttab.h | 3 +-- lib/sscanf.c | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/xen/gnttab.c b/drivers/xen/gnttab.c index becf7a79fb..9bf1091ab3 100644 --- a/drivers/xen/gnttab.c +++ b/drivers/xen/gnttab.c @@ -100,7 +100,8 @@ int gnttab_end_access(grant_ref_t ref) nflags = gnttab_table[ref].flags; do { - if ((flags = nflags) & (GTF_reading | GTF_writing)) { + flags = nflags; + if ((flags) & (GTF_reading | GTF_writing)) { printf("WARNING: g.e. still in use! (%x)\n", flags); return 0; } diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 76e82fbf41..1b3325bbe2 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -294,8 +294,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev) snprintf(path, sizeof(path), "%s/state", dev->backend); snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename); - if ((err = xenbus_switch_state(XBT_NIL, nodename, - XenbusStateClosing)) != NULL) { + err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosing); + if (err) { printf("%s: error changing state to %d: %s\n", __func__, XenbusStateClosing, err); goto close; @@ -306,8 +306,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev) err = xenbus_wait_for_state_change(path, &state); free(err); - if ((err = xenbus_switch_state(XBT_NIL, nodename, - XenbusStateClosed)) != NULL) { + err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed); + if (err) { printf("%s: error changing state to %d: %s\n", __func__, XenbusStateClosed, err); goto close; @@ -319,8 +319,8 @@ static void shutdown_blkfront(struct blkfront_dev *dev) free(err); } - if ((err = xenbus_switch_state(XBT_NIL, nodename, - XenbusStateInitialising)) != NULL) { + err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising); + if (err) { printf("%s: error changing state to %d: %s\n", __func__, XenbusStateInitialising, err); goto close; diff --git a/include/xen/gnttab.h b/include/xen/gnttab.h index db1d5361fe..db615004aa 100644 --- a/include/xen/gnttab.h +++ b/include/xen/gnttab.h @@ -1,5 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 * * (C) 2006, Steven Smith * (C) 2006, Grzegorz Milos diff --git a/lib/sscanf.c b/lib/sscanf.c index d1e2dc272c..4c35c035fe 100644 --- a/lib/sscanf.c +++ b/lib/sscanf.c @@ -555,7 +555,8 @@ literal: if (flags & SUPPRESS) { size_t sum = 0; - if ((n = inr) < width) { + n = inr; + if (n < width) { sum += n; width -= n; inp += n;