xen: Code style conformity

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 <anastasiia_lukianenko@epam.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/xen/gnttab.c b/drivers/xen/gnttab.c
index becf7a7..9bf1091 100644 (file)
--- 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 76e82fb..1b3325b 100644 (file)
--- 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 db1d536..db61500 100644 (file)
--- 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 <sos22@cam.ac.uk>
  * (C) 2006, Grzegorz Milos <gm281@cam.ac.uk>

diff --git a/lib/sscanf.c b/lib/sscanf.c
index d1e2dc2..4c35c03 100644 (file)
--- 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;