diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index dfbc8ef1fe000ce572e560aa58be4cfcb7a78984..43f5bb7da63939bac53a437c29a1527ea3c3ec21 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -82,7 +82,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl,
 
 	group->name = fdt_get_name(fdt, node, &len);
 
-	len =  fdt_stringlist_count(fdt, node, "nvidia,lanes");
+	len = fdt_stringlist_count(fdt, node, "nvidia,lanes");
 	if (len < 0) {
 		error("failed to parse \"nvidia,lanes\" property");
 		return -EINVAL;
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 1935b8d46f1eefe20f6a4cb009f2b2a56f122da1..dcf5d9df7ddcbbcc25ac9754d976f95c8a1972dd 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -698,8 +698,8 @@ fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name)
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 	int index;
 
-	index = fdt_stringlist_search(gd->fdt_blob, dev->of_offset, "reg-names",
-				name);
+	index = fdt_stringlist_search(gd->fdt_blob, dev->of_offset,
+				      "reg-names", name);
 	if (index < 0)
 		return index;
 
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 91570a29106f6d5ccd8ba80be7c976d097c8e8d9..6ac8ba3721f8000f6633fe28fd517c97429a0563 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -457,7 +457,7 @@ static int parse_phy_pins(struct udevice *dev)
 		int pin;
 
 		pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
-					 "allwinner,pins", i, NULL);
+					      "allwinner,pins", i, NULL);
 		if (!pin_name)
 			break;
 		if (pin_name[0] != 'P')
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index c9c13e68028f6272b8ceb27516ece0b369447901..dd0a16ef5fab75295bb43050d4d24f71998d2d65 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -80,7 +80,7 @@ int exynos_pinctrl_set_state(struct udevice *dev, struct udevice *config)
 	 * refer to the following document for the pinctrl bindings
 	 * linux/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 	 */
-	count =  fdt_stringlist_count(fdt, node, "samsung,pins");
+	count = fdt_stringlist_count(fdt, node, "samsung,pins");
 	if (count <= 0)
 		return -EINVAL;
 
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 482db295fee1c8eaf995d4c869f4d0a026e858bc..3629322dbb380ad9867dfcd855ef22eb55556d24 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -306,12 +306,12 @@ static int pinctrl_generic_set_state_subnode(struct udevice *dev,
 	const char *name;
 	int strings_count, selector, i, ret;
 
-	strings_count =  fdt_stringlist_count(fdt, node, subnode_target_type);
+	strings_count = fdt_stringlist_count(fdt, node, subnode_target_type);
 	if (strings_count < 0) {
 		subnode_target_type = "groups";
 		is_group = true;
-		strings_count =  fdt_stringlist_count(fdt, node,
-						  subnode_target_type);
+		strings_count = fdt_stringlist_count(fdt, node,
+						     subnode_target_type);
 		if (strings_count < 0) {
 			/* skip this node; may contain config child nodes */
 			return 0;
diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c
index 6cba1b95a110528dbda9d29d9370a7613f60d6d6..6f8ee01c10722602fd29d6288880024d2dff4cbe 100644
--- a/drivers/video/sunxi_display.c
+++ b/drivers/video/sunxi_display.c
@@ -1563,7 +1563,7 @@ int sunxi_simplefb_setup(void *blob)
 					       "allwinner,simple-framebuffer");
 	while (offset >= 0) {
 		ret = fdt_stringlist_search(blob, offset, "allwinner,pipeline",
-				      pipeline);
+					    pipeline);
 		if (ret == 0)
 			break;
 		offset = fdt_node_offset_by_compatible(blob, offset,