Input: rohm_bu21023 - factor out settings update code
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/3 Input: rohm_bu21023 - factor out settings update code
The code to toggle axis swapping and inversion is repetitive and can be factored out.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/touchscreen/rohm_bu21023.c | 77 +++++++++--------------- 1 file changed, 29 insertions(+), 48 deletions(-)
drivers/input/touchscreen/rohm_bu21023.c +29 -48
@@ -727,6 +727,29 @@ static int rohm_ts_load_firmware(struct i2c_client *client,return error ? error : error2; } +static int rohm_ts_update_setting (struct rohm_ts_data *ts, +unsigned int setting_bit,bool on) +{ +int error; + + error =mutex_lock_interruptible (&ts->input->mutex); +if (error) +return error; + +if (on) + ts->setup2 |= setting_bit; +else + ts->setup2 &= ~setting_bit; + +if (ts->initialized) + error =i2c_smbus_write_byte_data (ts->client,COMMON_SETUP2 , + ts->setup2); + +mutex_unlock (&ts->input->mutex); + +return error; +} +static ssize_t swap_xy_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -748,22 +771,8 @@ static ssize_t swap_xy_store(struct device *dev, struct device_attribute *attr,if (error)return error; - error =mutex_lock_interruptible (&ts->input->mutex); -if (error) -return error; - -if (val) - ts->setup2 |=SWAP_XY ; -else - ts->setup2 &= ~SWAP_XY ; - -if (ts->initialized) - error =i2c_smbus_write_byte_data (ts->client,COMMON_SETUP2 , - ts->setup2); - -mutex_unlock (&ts->input->mutex); - -return error ? error : count; + error =rohm_ts_update_setting (ts,SWAP_XY , val); +return error ?: count; } static ssize_t inv_x_show(struct device *dev, struct device_attribute *attr,
@@ -787,22 +796,8 @@ static ssize_t inv_x_store(struct device *dev, struct device_attribute *attr,if (error)return error; - error =mutex_lock_interruptible (&ts->input->mutex); -if (error) -return error; - -if (val) - ts->setup2 |=INV_X ; -else - ts->setup2 &= ~INV_X ; - -if (ts->initialized) - error =i2c_smbus_write_byte_data (ts->client,COMMON_SETUP2 , - ts->setup2); - -mutex_unlock (&ts->input->mutex); - -return error ? error : count; + error =rohm_ts_update_setting (ts,INV_X , val); +return error ?: count; } static ssize_t inv_y_show(struct device *dev, struct device_attribute *attr,
@@ -826,22 +821,8 @@ static ssize_t inv_y_store(struct device *dev, struct device_attribute *attr,if (error)return error; - error =mutex_lock_interruptible (&ts->input->mutex); -if (error) -return error; - -if (val) - ts->setup2 |=INV_Y ; -else - ts->setup2 &= ~INV_Y ; - -if (ts->initialized) - error =i2c_smbus_write_byte_data (client,COMMON_SETUP2 , - ts->setup2); - -mutex_unlock (&ts->input->mutex); - -return error ? error : count; + error =rohm_ts_update_setting (ts,INV_Y , val); +return error ?: count; }static DEVICE_ATTR_RW (swap_xy);
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog
Dmitry Torokhov
maintainerPATCH 2/3 Input: rohm_bu21023 - switch to using sysfs_emit()
sysfs_emit() is preferred over snprintf() for sysfs attribute handling.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/touchscreen/rohm_bu21023.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/touchscreen/rohm_bu21023.c +3 -3
@@ -756,7 +756,7 @@ static ssize_t swap_xy_show(struct device *dev, struct device_attribute *attr,struct i2c_client *client =to_i2c_client (dev);struct rohm_ts_data *ts =i2c_get_clientdata (client); -return sprintf (buf,"%d\n" , !!(ts->setup2 &SWAP_XY )); +return sysfs_emit (buf,"%d\n" , !!(ts->setup2 &SWAP_XY )); } static ssize_t swap_xy_store(struct device *dev, struct device_attribute *attr,
@@ -781,7 +781,7 @@ static ssize_t inv_x_show(struct device *dev, struct device_attribute *attr,struct i2c_client *client =to_i2c_client (dev);struct rohm_ts_data *ts =i2c_get_clientdata (client); -return sprintf (buf,"%d\n" , !!(ts->setup2 &INV_X )); +return sysfs_emit (buf,"%d\n" , !!(ts->setup2 &INV_X )); } static ssize_t inv_x_store(struct device *dev, struct device_attribute *attr,
@@ -806,7 +806,7 @@ static ssize_t inv_y_show(struct device *dev, struct device_attribute *attr,struct i2c_client *client =to_i2c_client (dev);struct rohm_ts_data *ts =i2c_get_clientdata (client); -return sprintf (buf,"%d\n" , !!(ts->setup2 &INV_Y )); +return sysfs_emit (buf,"%d\n" , !!(ts->setup2 &INV_Y )); } static ssize_t inv_y_store(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog
Dmitry Torokhov
maintainerPATCH 3/3 Input: rohm_bu21023 - switch to using cleanup functions
In reply to Dmitry TorokhovStart using __free() and guard() primitives to simplify the code and error handling.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/touchscreen/rohm_bu21023.c | 40 +++++++++++------------- 1 file changed, 19 insertions(+), 21 deletions(-)
drivers/input/touchscreen/rohm_bu21023.c +19 -21
@@ -643,12 +643,12 @@ static int rohm_ts_load_firmware(struct i2c_client *client, const char *firmware_name) {struct device *dev = &client->dev; -const struct firmware *fw;s32 status;unsigned int offset, len, xfer_len;unsigned int retry =0 ;int error, error2; + const struct firmware *fw __free(firmware) = NULL; error =request_firmware (&fw, firmware_name, dev);if (error) { dev_err(dev, "unable to retrieve firmware %s: %d\n",
@@ -722,8 +722,6 @@ static int rohm_ts_load_firmware(struct i2c_client *client, out: error2 =i2c_smbus_write_byte_data (client,INT_MASK ,INT_ALL ); -release_firmware (fw); -return error ? error : error2; }
@@ -732,22 +730,22 @@ static int rohm_ts_update_setting(struct rohm_ts_data *ts, {int error; - error =mutex_lock_interruptible (&ts->input->mutex); -if (error) -return error; - -if (on) - ts->setup2 |= setting_bit; -else - ts->setup2 &= ~setting_bit; + scoped_cond_guard(mutex_intr, return -EINTR, &ts->input->mutex) { +if (on) + ts->setup2 |= setting_bit; +else + ts->setup2 &= ~setting_bit; -if (ts->initialized) - error =i2c_smbus_write_byte_data (ts->client,COMMON_SETUP2 , - ts->setup2); - -mutex_unlock (&ts->input->mutex); +if (ts->initialized) { + error =i2c_smbus_write_byte_data (ts->client, +COMMON_SETUP2 , + ts->setup2); +if (error) +return error; + } + } -return error; +return 0 ; } static ssize_t swap_xy_show(struct device *dev, struct device_attribute *attr,
@@ -842,7 +840,7 @@ static int rohm_ts_device_init(struct i2c_client *client, u8 setup2)struct device *dev = &client->dev;int error; -disable_irq (client->irq); +guard (disable_irq)(&client->irq);/* * Wait 200usec for reset
@@ -1017,10 +1015,10 @@ static int rohm_ts_device_init(struct i2c_client *client, u8 setup2)/* controller CPU power on */ error =i2c_smbus_write_byte_data (client,SYSTEM ,ANALOG_POWER_ON |CPU_POWER_ON ); +if (error) +return error; -enable_irq (client->irq); - -return error; +return 0 ; }static int rohm_ts_power_off (struct i2c_client *client)
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog