Skip to contentSkip to conversation

remove identation for common path

PATCH In review sundar 2 participants 4 messages Apr 20, 2024

Subsystems (2)
lore
Share & tools
lore

sundar

author
#0 lore raw

PATCH 1/1 remove identation for common path

Added check if pointer is null and removed identation for common path

---

Fixed nitpicks in code according to comments received on other patch.

https://lore.kernel.org/all/2024041103-doornail-professor-7c1e@gregkh/

goal is to get rid of of_node_put,but sending this patch first to do one thing at a time.

 drivers/usb/typec/mux/nb7vpq904m.c | 49 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 24 deletions(-)
drivers/usb/typec/mux/nb7vpq904m.c +25 -24
index b17826713753..fe0257840dd5 100644
@@ -321,35 +321,37 @@ static int nb7vpq904m_parse_data_lanes_mapping(struct nb7vpq904m *nb7)
 
 	ep = of_graph_get_endpoint_by_regs(nb7->client->dev.of_node, 1, 0);
 
-	if (ep) {
-		ret = of_property_count_u32_elems(ep, "data-lanes");
-		if (ret == -EINVAL)
-			/* Property isn't here, consider default mapping */
-			goto out_done;
-		if (ret < 0)
-			goto out_error;
-
-		if (ret != DATA_LANES_COUNT) {
-			dev_err(&nb7->client->dev, "expected 4 data lanes\n");
-			ret = -EINVAL;
-			goto out_error;
-		}
+	if (!ep)
+		return 0;
 
-		ret = of_property_read_u32_array(ep, "data-lanes", data_lanes, DATA_LANES_COUNT);
-		if (ret)
-			goto out_error;
+	ret = of_property_count_u32_elems(ep, "data-lanes");
+	if (ret == -EINVAL)
+		/* Property isn't here, consider default mapping */
+		goto out_done;
+	if (ret < 0)
+		goto out_error;
+
+	if (ret != DATA_LANES_COUNT) {
+		dev_err(&nb7->client->dev, "expected 4 data lanes\n");
+		ret = -EINVAL;
+		goto out_error;
+	}
 
-		for (i = 0; i < ARRAY_SIZE(supported_data_lane_mapping); i++) {
-			for (j = 0; j < DATA_LANES_COUNT; j++) {
-				if (data_lanes[j] != supported_data_lane_mapping[i][j])
-					break;
-			}
+	ret = of_property_read_u32_array(ep, "data-lanes", data_lanes, DATA_LANES_COUNT);
+	if (ret)
+		goto out_error;
 
-			if (j == DATA_LANES_COUNT)
+	for (i = 0; i < ARRAY_SIZE(supported_data_lane_mapping); i++) {
+		for (j = 0; j < DATA_LANES_COUNT; j++) {
+			if (data_lanes[j] != supported_data_lane_mapping[i][j])
 				break;
 		}
 
-		switch (i) {
+		if (j == DATA_LANES_COUNT)
+			break;
+	}
+
+	switch (i) {
 		case NORMAL_LANE_MAPPING:
 			break;
 		case INVERT_LANE_MAPPING:
@@ -360,7 +362,6 @@ static int nb7vpq904m_parse_data_lanes_mapping(struct nb7vpq904m *nb7)
 			dev_err(&nb7->client->dev, "invalid data lanes mapping\n");
 			ret = -EINVAL;
 			goto out_error;
-		}
 	}
 
 out_done:
Signature · 1 line
2.34.1
author
#1 lore raw
Quoted 82 lines · sundar

Added check if pointer is null and removed identation for common path

---

Fixed nitpicks in code according to comments received on other patch.

https://lore.kernel.org/all/2024041103-doornail-professor-7c1e@gregkh/

goal is to get rid of of_node_put,but sending this patch first to do one thing at a time.

  drivers/usb/typec/mux/nb7vpq904m.c | 49 +++++++++++++++---------------
  1 file changed, 25 insertions(+), 24 deletions(-)
drivers/usb/typec/mux/nb7vpq904m.c +25 -23
index b17826713753..fe0257840dd5 100644
@@ -321,35 +321,37 @@ static int nb7vpq904m_parse_data_lanes_mapping(struct nb7vpq904m *nb7)
 
  	ep = of_graph_get_endpoint_by_regs(nb7->client->dev.of_node, 1, 0);
 
-	if (ep) {
-		ret = of_property_count_u32_elems(ep, "data-lanes");
-		if (ret == -EINVAL)
-			/* Property isn't here, consider default mapping */
-			goto out_done;
-		if (ret < 0)
-			goto out_error;
-
-		if (ret != DATA_LANES_COUNT) {
-			dev_err(&nb7->client->dev, "expected 4 data lanes\n");
-			ret = -EINVAL;
-			goto out_error;
-		}
+	if (!ep)
+		return 0;
 
-		ret = of_property_read_u32_array(ep, "data-lanes", data_lanes, DATA_LANES_COUNT);
-		if (ret)
-			goto out_error;
+	ret = of_property_count_u32_elems(ep, "data-lanes");
+	if (ret == -EINVAL)
+		/* Property isn't here, consider default mapping */
+		goto out_done;
+	if (ret < 0)
+		goto out_error;
+
+	if (ret != DATA_LANES_COUNT) {
+		dev_err(&nb7->client->dev, "expected 4 data lanes\n");
+		ret = -EINVAL;
+		goto out_error;
+	}
 
-		for (i = 0; i < ARRAY_SIZE(supported_data_lane_mapping); i++) {
-			for (j = 0; j < DATA_LANES_COUNT; j++) {
-				if (data_lanes[j] != supported_data_lane_mapping[i][j])
-					break;
-			}
+	ret = of_property_read_u32_array(ep, "data-lanes", data_lanes, DATA_LANES_COUNT);
+	if (ret)
+		goto out_error;
 
-			if (j == DATA_LANES_COUNT)
+	for (i = 0; i < ARRAY_SIZE(supported_data_lane_mapping); i++) {
+		for (j = 0; j < DATA_LANES_COUNT; j++) {
+			if (data_lanes[j] != supported_data_lane_mapping[i][j])
  				break;
  		}
 
-		switch (i) {
+		if (j == DATA_LANES_COUNT)
+			break;
+	}
+
+	switch (i) {
  		case NORMAL_LANE_MAPPING:
  			break;
  		case INVERT_LANE_MAPPING:

drivers/usb/typec/mux/nb7vpq904m.c static int nb7vpq904m_parse_data_lanes_mapping(struct nb7vpq904m *nb7) · line 367

Quoted 7 lines
drivers/usb/typec/mux/nb7vpq904m.c +0 -1
@@ -360,7 +362,6 @@ static int nb7vpq904m_parse_data_lanes_mapping(struct nb7vpq904m *nb7)
  			dev_err(&nb7->client->dev, "invalid data lanes mapping\n");
  			ret = -EINVAL;
  			goto out_error;
-		}
  	}
 
  out_done:

Apologise, Forget to add info.
This patch is for linux-next repo.

Thanks,
Sundar

#2 lore raw
Quoted 2 lines · sundar.R
Quoted 1 line · sundar

Added check if pointer is null and removed identation for common path

In Subject and the line above, spell "indentation".

Signature · 3 lines
#Randy
https://people.kernel.org/tglx/notes-about-netiquette
https://subspace.kernel.org/etiquette.html
author
#3 lore raw
Quoted 8 lines · Randy Dunlap
Quoted 2 lines · sundar.R
Quoted 1 line · sundar

Added check if pointer is null and removed identation for common path

In Subject and the line above, spell "indentation".

Thanks for pointing it out. will fix the typo error. And send the updated version.

Thanks,
Sundar