Commit 1864a200 authored by ye xingchen's avatar ye xingchen Committed by Dmitry Torokhov

Input: mouse - use sysfs_emit[_at]() instead of scnprintf()

Replace the calls to various *printf() functions with sysfs_emit() to
simplify the code.
Signed-off-by: default avatarye xingchen <ye.xingchen@zte.com.cn>
Link: https://lore.kernel.org/r/202212021453578171100@zte.com.cnSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d4db8762
...@@ -756,16 +756,16 @@ static ssize_t cyapa_show_suspend_scanrate(struct device *dev, ...@@ -756,16 +756,16 @@ static ssize_t cyapa_show_suspend_scanrate(struct device *dev,
switch (pwr_cmd) { switch (pwr_cmd) {
case PWR_MODE_BTN_ONLY: case PWR_MODE_BTN_ONLY:
len = scnprintf(buf, PAGE_SIZE, "%s\n", BTN_ONLY_MODE_NAME); len = sysfs_emit(buf, "%s\n", BTN_ONLY_MODE_NAME);
break; break;
case PWR_MODE_OFF: case PWR_MODE_OFF:
len = scnprintf(buf, PAGE_SIZE, "%s\n", OFF_MODE_NAME); len = sysfs_emit(buf, "%s\n", OFF_MODE_NAME);
break; break;
default: default:
len = scnprintf(buf, PAGE_SIZE, "%u\n", len = sysfs_emit(buf, "%u\n",
cyapa->gen == CYAPA_GEN3 ? cyapa->gen == CYAPA_GEN3 ?
cyapa_pwr_cmd_to_sleep_time(pwr_cmd) : cyapa_pwr_cmd_to_sleep_time(pwr_cmd) :
sleep_time); sleep_time);
break; break;
...@@ -877,8 +877,8 @@ static ssize_t cyapa_show_rt_suspend_scanrate(struct device *dev, ...@@ -877,8 +877,8 @@ static ssize_t cyapa_show_rt_suspend_scanrate(struct device *dev,
mutex_unlock(&cyapa->state_sync_lock); mutex_unlock(&cyapa->state_sync_lock);
return scnprintf(buf, PAGE_SIZE, "%u\n", return sysfs_emit(buf, "%u\n",
cyapa->gen == CYAPA_GEN3 ? cyapa->gen == CYAPA_GEN3 ?
cyapa_pwr_cmd_to_sleep_time(pwr_cmd) : cyapa_pwr_cmd_to_sleep_time(pwr_cmd) :
sleep_time); sleep_time);
} }
...@@ -988,8 +988,8 @@ static ssize_t cyapa_show_fm_ver(struct device *dev, ...@@ -988,8 +988,8 @@ static ssize_t cyapa_show_fm_ver(struct device *dev,
error = mutex_lock_interruptible(&cyapa->state_sync_lock); error = mutex_lock_interruptible(&cyapa->state_sync_lock);
if (error) if (error)
return error; return error;
error = scnprintf(buf, PAGE_SIZE, "%d.%d\n", cyapa->fw_maj_ver, error = sysfs_emit(buf, "%d.%d\n",
cyapa->fw_min_ver); cyapa->fw_maj_ver, cyapa->fw_min_ver);
mutex_unlock(&cyapa->state_sync_lock); mutex_unlock(&cyapa->state_sync_lock);
return error; return error;
} }
...@@ -1004,7 +1004,7 @@ static ssize_t cyapa_show_product_id(struct device *dev, ...@@ -1004,7 +1004,7 @@ static ssize_t cyapa_show_product_id(struct device *dev,
error = mutex_lock_interruptible(&cyapa->state_sync_lock); error = mutex_lock_interruptible(&cyapa->state_sync_lock);
if (error) if (error)
return error; return error;
size = scnprintf(buf, PAGE_SIZE, "%s\n", cyapa->product_id); size = sysfs_emit(buf, "%s\n", cyapa->product_id);
mutex_unlock(&cyapa->state_sync_lock); mutex_unlock(&cyapa->state_sync_lock);
return size; return size;
} }
...@@ -1209,8 +1209,8 @@ static ssize_t cyapa_show_mode(struct device *dev, ...@@ -1209,8 +1209,8 @@ static ssize_t cyapa_show_mode(struct device *dev,
if (error) if (error)
return error; return error;
size = scnprintf(buf, PAGE_SIZE, "gen%d %s\n", size = sysfs_emit(buf, "gen%d %s\n",
cyapa->gen, cyapa_state_to_string(cyapa)); cyapa->gen, cyapa_state_to_string(cyapa));
mutex_unlock(&cyapa->state_sync_lock); mutex_unlock(&cyapa->state_sync_lock);
return size; return size;
......
...@@ -860,7 +860,7 @@ static ssize_t cyapa_gen3_show_baseline(struct device *dev, ...@@ -860,7 +860,7 @@ static ssize_t cyapa_gen3_show_baseline(struct device *dev,
dev_dbg(dev, "Baseline report successful. Max: %d Min: %d\n", dev_dbg(dev, "Baseline report successful. Max: %d Min: %d\n",
max_baseline, min_baseline); max_baseline, min_baseline);
ret = scnprintf(buf, PAGE_SIZE, "%d %d\n", max_baseline, min_baseline); ret = sysfs_emit(buf, "%d %d\n", max_baseline, min_baseline);
out: out:
return ret; return ret;
......
...@@ -2418,12 +2418,12 @@ static ssize_t cyapa_gen5_show_baseline(struct device *dev, ...@@ -2418,12 +2418,12 @@ static ssize_t cyapa_gen5_show_baseline(struct device *dev,
return resume_error ? resume_error : error; return resume_error ? resume_error : error;
/* 12. Output data strings */ /* 12. Output data strings */
size = scnprintf(buf, PAGE_SIZE, "%d %d %d %d %d %d %d %d %d %d %d ", size = sysfs_emit(buf, "%d %d %d %d %d %d %d %d %d %d %d ",
gidac_mutual_min, gidac_mutual_max, gidac_mutual_ave, gidac_mutual_min, gidac_mutual_max, gidac_mutual_ave,
lidac_mutual_min, lidac_mutual_max, lidac_mutual_ave, lidac_mutual_min, lidac_mutual_max, lidac_mutual_ave,
gidac_self_rx, gidac_self_tx, gidac_self_rx, gidac_self_tx,
lidac_self_min, lidac_self_max, lidac_self_ave); lidac_self_min, lidac_self_max, lidac_self_ave);
size += scnprintf(buf + size, PAGE_SIZE - size, size += sysfs_emit_at(buf, size,
"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
raw_cap_mutual_min, raw_cap_mutual_max, raw_cap_mutual_ave, raw_cap_mutual_min, raw_cap_mutual_max, raw_cap_mutual_ave,
raw_cap_self_min, raw_cap_self_max, raw_cap_self_ave, raw_cap_self_min, raw_cap_self_max, raw_cap_self_ave,
......
...@@ -629,14 +629,14 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev, ...@@ -629,14 +629,14 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev,
if (error) if (error)
goto resume_scanning; goto resume_scanning;
size = scnprintf(buf, PAGE_SIZE, "%d %d %d %d %d %d ", size = sysfs_emit(buf, "%d %d %d %d %d %d ",
data[0], /* RX Attenuator Mutual */ data[0], /* RX Attenuator Mutual */
data[1], /* IDAC Mutual */ data[1], /* IDAC Mutual */
data[2], /* RX Attenuator Self RX */ data[2], /* RX Attenuator Self RX */
data[3], /* IDAC Self RX */ data[3], /* IDAC Self RX */
data[4], /* RX Attenuator Self TX */ data[4], /* RX Attenuator Self TX */
data[5] /* IDAC Self TX */ data[5] /* IDAC Self TX */
); );
/* 3. Read Attenuator Trim. */ /* 3. Read Attenuator Trim. */
data_len = sizeof(data); data_len = sizeof(data);
...@@ -648,8 +648,8 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev, ...@@ -648,8 +648,8 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev,
/* set attenuator trim values. */ /* set attenuator trim values. */
for (i = 0; i < data_len; i++) for (i = 0; i < data_len; i++)
size += scnprintf(buf + size, PAGE_SIZE - size, "%d ", data[i]); size += sysfs_emit_at(buf, size, "%d ", data[i]);
size += scnprintf(buf + size, PAGE_SIZE - size, "\n"); size += sysfs_emit_at(buf, size, "\n");
resume_scanning: resume_scanning:
/* 4. Resume Scanning*/ /* 4. Resume Scanning*/
......
...@@ -572,7 +572,7 @@ static ssize_t elan_sysfs_read_fw_checksum(struct device *dev, ...@@ -572,7 +572,7 @@ static ssize_t elan_sysfs_read_fw_checksum(struct device *dev,
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
return sprintf(buf, "0x%04x\n", data->fw_checksum); return sysfs_emit(buf, "0x%04x\n", data->fw_checksum);
} }
static ssize_t elan_sysfs_read_product_id(struct device *dev, static ssize_t elan_sysfs_read_product_id(struct device *dev,
...@@ -582,8 +582,8 @@ static ssize_t elan_sysfs_read_product_id(struct device *dev, ...@@ -582,8 +582,8 @@ static ssize_t elan_sysfs_read_product_id(struct device *dev,
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
return sprintf(buf, ETP_PRODUCT_ID_FORMAT_STRING "\n", return sysfs_emit(buf, ETP_PRODUCT_ID_FORMAT_STRING "\n",
data->product_id); data->product_id);
} }
static ssize_t elan_sysfs_read_fw_ver(struct device *dev, static ssize_t elan_sysfs_read_fw_ver(struct device *dev,
...@@ -593,7 +593,7 @@ static ssize_t elan_sysfs_read_fw_ver(struct device *dev, ...@@ -593,7 +593,7 @@ static ssize_t elan_sysfs_read_fw_ver(struct device *dev,
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
return sprintf(buf, "%d.0\n", data->fw_version); return sysfs_emit(buf, "%d.0\n", data->fw_version);
} }
static ssize_t elan_sysfs_read_sm_ver(struct device *dev, static ssize_t elan_sysfs_read_sm_ver(struct device *dev,
...@@ -603,7 +603,7 @@ static ssize_t elan_sysfs_read_sm_ver(struct device *dev, ...@@ -603,7 +603,7 @@ static ssize_t elan_sysfs_read_sm_ver(struct device *dev,
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
return sprintf(buf, "%d.0\n", data->sm_version); return sysfs_emit(buf, "%d.0\n", data->sm_version);
} }
static ssize_t elan_sysfs_read_iap_ver(struct device *dev, static ssize_t elan_sysfs_read_iap_ver(struct device *dev,
...@@ -613,7 +613,7 @@ static ssize_t elan_sysfs_read_iap_ver(struct device *dev, ...@@ -613,7 +613,7 @@ static ssize_t elan_sysfs_read_iap_ver(struct device *dev,
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct elan_tp_data *data = i2c_get_clientdata(client); struct elan_tp_data *data = i2c_get_clientdata(client);
return sprintf(buf, "%d.0\n", data->iap_version); return sysfs_emit(buf, "%d.0\n", data->iap_version);
} }
static ssize_t elan_sysfs_update_fw(struct device *dev, static ssize_t elan_sysfs_update_fw(struct device *dev,
...@@ -754,7 +754,7 @@ static ssize_t elan_sysfs_read_mode(struct device *dev, ...@@ -754,7 +754,7 @@ static ssize_t elan_sysfs_read_mode(struct device *dev,
if (error) if (error)
return error; return error;
return sprintf(buf, "%d\n", (int)mode); return sysfs_emit(buf, "%d\n", (int)mode);
} }
static DEVICE_ATTR(product_id, S_IRUGO, elan_sysfs_read_product_id, NULL); static DEVICE_ATTR(product_id, S_IRUGO, elan_sysfs_read_product_id, NULL);
...@@ -858,7 +858,7 @@ static ssize_t min_show(struct device *dev, ...@@ -858,7 +858,7 @@ static ssize_t min_show(struct device *dev,
goto out; goto out;
} }
retval = snprintf(buf, PAGE_SIZE, "%d", data->min_baseline); retval = sysfs_emit(buf, "%d", data->min_baseline);
out: out:
mutex_unlock(&data->sysfs_mutex); mutex_unlock(&data->sysfs_mutex);
...@@ -881,7 +881,7 @@ static ssize_t max_show(struct device *dev, ...@@ -881,7 +881,7 @@ static ssize_t max_show(struct device *dev,
goto out; goto out;
} }
retval = snprintf(buf, PAGE_SIZE, "%d", data->max_baseline); retval = sysfs_emit(buf, "%d", data->max_baseline);
out: out:
mutex_unlock(&data->sysfs_mutex); mutex_unlock(&data->sysfs_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment