Message ID | 1443793229-22363-18-git-send-email-javier@osg.samsung.com (mailing list archive) |
---|---|
State | Rejected |
Headers | show |
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)
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(-)