Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1238269 > unrolled thread

[PATCH 17/18] Input: cypress_ps2 - simplify function return logic

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 17/18] Input: cypress_ps2 - simplify function return logic Javier Martinez Canillas <javier@osg.samsung.com> - 2015-10-02 15:50 +0200

#1238269 — [PATCH 17/18] Input: cypress_ps2 - simplify function return logic

The invoked function already returns zero on success or a negative
errno code so there is no need to open code the logic in the caller.

This also fixes the following make coccicheck warning:

drivers/input/mouse/cypress_ps2.c:333:1-4: WARNING: end returns can be simplified

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/input/mouse/cypress_ps2.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index 28dcfc822bf6..bca984f53434 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -330,11 +330,7 @@ static int cypress_query_hardware(struct psmouse *psmouse)
 	if (ret)
 		return ret;
 
-	ret = cypress_read_tp_metrics(psmouse);
-	if (ret)
-		return ret;
-
-	return 0;
+	return cypress_read_tp_metrics(psmouse);
 }
 
 static int cypress_set_absolute_mode(struct psmouse *psmouse)
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web