[U-Boot] [RESEND PATCH v2 1/4] core: ofnode: Fix style violations

Mario Six mario.six at gdsys.cc
Mon Jan 15 10:07:17 UTC 2018


There are some style violations in ofnode.c; fix those.

Reviewed-by: Simon Glass <sjg at chromium.org>
Signed-off-by: Mario Six <mario.six at gdsys.cc>
---

v1 -> v2:
None

---
 drivers/core/ofnode.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 0030ab962e..ebcf64d867 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -296,7 +296,8 @@ int ofnode_parse_phandle_with_args(ofnode node, const char *list_name,
 		int ret;

 		ret = of_parse_phandle_with_args(ofnode_to_np(node),
-				list_name, cells_name, index, &args);
+						 list_name, cells_name, index,
+						 &args);
 		if (ret)
 			return ret;
 		ofnode_from_of_phandle_args(&args, out_args);
@@ -305,8 +306,9 @@ int ofnode_parse_phandle_with_args(ofnode node, const char *list_name,
 		int ret;

 		ret = fdtdec_parse_phandle_with_args(gd->fdt_blob,
-				ofnode_to_offset(node), list_name, cells_name,
-				cell_count, index, &args);
+						     ofnode_to_offset(node),
+						     list_name, cells_name,
+						     cell_count, index, &args);
 		if (ret)
 			return ret;
 		ofnode_from_fdtdec_phandle_args(&args, out_args);
@@ -534,10 +536,10 @@ int ofnode_read_pci_addr(ofnode node, enum fdt_pci_space type,
 				addr->phys_mid = fdt32_to_cpu(cell[1]);
 				addr->phys_lo = fdt32_to_cpu(cell[1]);
 				break;
-			} else {
-				cell += (FDT_PCI_ADDR_CELLS +
-					 FDT_PCI_SIZE_CELLS);
 			}
+
+			cell += (FDT_PCI_ADDR_CELLS +
+				 FDT_PCI_SIZE_CELLS);
 		}

 		if (i == num) {
@@ -546,10 +548,10 @@ int ofnode_read_pci_addr(ofnode node, enum fdt_pci_space type,
 		}

 		return 0;
-	} else {
-		ret = -EINVAL;
 	}

+	ret = -EINVAL;
+
 fail:
 	debug("(not found)\n");
 	return ret;
--
2.11.0



More information about the U-Boot mailing list