lkml.org 
[lkml]   [2017]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] Input-as5011: Use common error handling code in as5011_configure_chip()
Date
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 26 Oct 2017 20:48:49 +0200

Add a jump target so that a specific error message is stored only once
at the end of this function implementation.
Replace four calls of the function "dev_err" by goto statements.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/input/joystick/as5011.c | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 005d852a06e9..1858ebec020a 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -192,28 +192,20 @@ static int as5011_configure_chip(struct as5011_device *as5011,

/* write threshold */
error = as5011_i2c_write(client, AS5011_XP, plat_dat->xp);
- if (error < 0) {
- dev_err(&client->dev, "Can't write threshold\n");
- return error;
- }
+ if (error < 0)
+ goto report_write_failure;

error = as5011_i2c_write(client, AS5011_XN, plat_dat->xn);
- if (error < 0) {
- dev_err(&client->dev, "Can't write threshold\n");
- return error;
- }
+ if (error < 0)
+ goto report_write_failure;

error = as5011_i2c_write(client, AS5011_YP, plat_dat->yp);
- if (error < 0) {
- dev_err(&client->dev, "Can't write threshold\n");
- return error;
- }
+ if (error < 0)
+ goto report_write_failure;

error = as5011_i2c_write(client, AS5011_YN, plat_dat->yn);
- if (error < 0) {
- dev_err(&client->dev, "Can't write threshold\n");
- return error;
- }
+ if (error < 0)
+ goto report_write_failure;

/* to free irq gpio in chip */
error = as5011_i2c_read(client, AS5011_X_RES_INT, &value);
@@ -223,6 +215,10 @@ static int as5011_configure_chip(struct as5011_device *as5011,
}

return 0;
+
+report_write_failure:
+ dev_err(&client->dev, "Can't write threshold\n");
+ return error;
}

static int as5011_probe(struct i2c_client *client,
--
2.14.3
\
 
 \ /
  Last update: 2017-10-26 20:57    [W:0.033 / U:0.200 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site