diff mbox

[1/7] input/ti_am_335x_tsc: remove the else case

Message ID 1369256897-25984-1-git-send-email-bigeasy@linutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Sebastian Andrzej Siewior May 22, 2013, 9:08 p.m. UTC 
The DT support added in ("input: touchscreen: am335x: Add DT support")
added an else case which shifts the code to the righ for no reaseon.
This patch simply removes the pointless else case and shifts the code
back to the left.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 drivers/input/touchscreen/ti_am335x_tsc.c |   63 +++++++++++++----------------
 1 file changed, 28 insertions(+), 35 deletions(-)
diff mbox

Patch

diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 4fcf72f..20f4505 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -396,41 +396,34 @@  static int titsc_parse_dt(struct ti_tscadc_dev *tscadc_dev,
 
 	if (!node)
 		return -EINVAL;
-	else {
-		node = of_get_child_by_name(node, "tsc");
-		if (!node)
-			return -EINVAL;
-		else {
-			err = of_property_read_u32(node, "ti,wires", &val32);
-			if (err < 0)
-				goto error_ret;
-			else
-				ts_dev->wires = val32;
-
-			err = of_property_read_u32(node,
-					"ti,x-plate-resistance", &val32);
-			if (err < 0)
-				goto error_ret;
-			else
-				ts_dev->x_plate_resistance = val32;
-
-			err = of_property_read_u32(node,
-					"ti,steps-to-configure", &val32);
-			if (err < 0)
-				goto error_ret;
-			else
-				ts_dev->steps_to_configure = val32;
-
-			err = of_property_read_u32_array(node, "ti,wire-config",
-					wires_conf, ARRAY_SIZE(wires_conf));
-			if (err < 0)
-				goto error_ret;
-			else {
-				for (i = 0; i < ARRAY_SIZE(wires_conf); i++)
-					ts_dev->config_inp[i] = wires_conf[i];
-			}
-		}
-	}
+
+	node = of_get_child_by_name(node, "tsc");
+	if (!node)
+		return -EINVAL;
+	err = of_property_read_u32(node, "ti,wires", &val32);
+	if (err < 0)
+		goto error_ret;
+	ts_dev->wires = val32;
+
+	err = of_property_read_u32(node,
+			"ti,x-plate-resistance", &val32);
+	if (err < 0)
+		goto error_ret;
+	ts_dev->x_plate_resistance = val32;
+
+	err = of_property_read_u32(node,
+			"ti,steps-to-configure", &val32);
+	if (err < 0)
+		goto error_ret;
+	ts_dev->steps_to_configure = val32;
+
+	err = of_property_read_u32_array(node, "ti,wire-config",
+			wires_conf, ARRAY_SIZE(wires_conf));
+	if (err < 0)
+		goto error_ret;
+
+	for (i = 0; i < ARRAY_SIZE(wires_conf); i++)
+		ts_dev->config_inp[i] = wires_conf[i];
 	return 0;
 
 error_ret: