Skip to content

Commit 1864a20

Browse files
ye xingchendtor
authored andcommitted
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: ye xingchen <ye.xingchen@zte.com.cn> Link: https://lore.kernel.org/r/202212021453578171100@zte.com.cn Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent d4db876 commit 1864a20

5 files changed

Lines changed: 33 additions & 33 deletions

File tree

drivers/input/mouse/cyapa.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -756,16 +756,16 @@ static ssize_t cyapa_show_suspend_scanrate(struct device *dev,
756756

757757
switch (pwr_cmd) {
758758
case PWR_MODE_BTN_ONLY:
759-
len = scnprintf(buf, PAGE_SIZE, "%s\n", BTN_ONLY_MODE_NAME);
759+
len = sysfs_emit(buf, "%s\n", BTN_ONLY_MODE_NAME);
760760
break;
761761

762762
case PWR_MODE_OFF:
763-
len = scnprintf(buf, PAGE_SIZE, "%s\n", OFF_MODE_NAME);
763+
len = sysfs_emit(buf, "%s\n", OFF_MODE_NAME);
764764
break;
765765

766766
default:
767-
len = scnprintf(buf, PAGE_SIZE, "%u\n",
768-
cyapa->gen == CYAPA_GEN3 ?
767+
len = sysfs_emit(buf, "%u\n",
768+
cyapa->gen == CYAPA_GEN3 ?
769769
cyapa_pwr_cmd_to_sleep_time(pwr_cmd) :
770770
sleep_time);
771771
break;
@@ -877,8 +877,8 @@ static ssize_t cyapa_show_rt_suspend_scanrate(struct device *dev,
877877

878878
mutex_unlock(&cyapa->state_sync_lock);
879879

880-
return scnprintf(buf, PAGE_SIZE, "%u\n",
881-
cyapa->gen == CYAPA_GEN3 ?
880+
return sysfs_emit(buf, "%u\n",
881+
cyapa->gen == CYAPA_GEN3 ?
882882
cyapa_pwr_cmd_to_sleep_time(pwr_cmd) :
883883
sleep_time);
884884
}
@@ -988,8 +988,8 @@ static ssize_t cyapa_show_fm_ver(struct device *dev,
988988
error = mutex_lock_interruptible(&cyapa->state_sync_lock);
989989
if (error)
990990
return error;
991-
error = scnprintf(buf, PAGE_SIZE, "%d.%d\n", cyapa->fw_maj_ver,
992-
cyapa->fw_min_ver);
991+
error = sysfs_emit(buf, "%d.%d\n",
992+
cyapa->fw_maj_ver, cyapa->fw_min_ver);
993993
mutex_unlock(&cyapa->state_sync_lock);
994994
return error;
995995
}
@@ -1004,7 +1004,7 @@ static ssize_t cyapa_show_product_id(struct device *dev,
10041004
error = mutex_lock_interruptible(&cyapa->state_sync_lock);
10051005
if (error)
10061006
return error;
1007-
size = scnprintf(buf, PAGE_SIZE, "%s\n", cyapa->product_id);
1007+
size = sysfs_emit(buf, "%s\n", cyapa->product_id);
10081008
mutex_unlock(&cyapa->state_sync_lock);
10091009
return size;
10101010
}
@@ -1209,8 +1209,8 @@ static ssize_t cyapa_show_mode(struct device *dev,
12091209
if (error)
12101210
return error;
12111211

1212-
size = scnprintf(buf, PAGE_SIZE, "gen%d %s\n",
1213-
cyapa->gen, cyapa_state_to_string(cyapa));
1212+
size = sysfs_emit(buf, "gen%d %s\n",
1213+
cyapa->gen, cyapa_state_to_string(cyapa));
12141214

12151215
mutex_unlock(&cyapa->state_sync_lock);
12161216
return size;

drivers/input/mouse/cyapa_gen3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ static ssize_t cyapa_gen3_show_baseline(struct device *dev,
860860

861861
dev_dbg(dev, "Baseline report successful. Max: %d Min: %d\n",
862862
max_baseline, min_baseline);
863-
ret = scnprintf(buf, PAGE_SIZE, "%d %d\n", max_baseline, min_baseline);
863+
ret = sysfs_emit(buf, "%d %d\n", max_baseline, min_baseline);
864864

865865
out:
866866
return ret;

drivers/input/mouse/cyapa_gen5.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,12 +2418,12 @@ static ssize_t cyapa_gen5_show_baseline(struct device *dev,
24182418
return resume_error ? resume_error : error;
24192419

24202420
/* 12. Output data strings */
2421-
size = scnprintf(buf, PAGE_SIZE, "%d %d %d %d %d %d %d %d %d %d %d ",
2421+
size = sysfs_emit(buf, "%d %d %d %d %d %d %d %d %d %d %d ",
24222422
gidac_mutual_min, gidac_mutual_max, gidac_mutual_ave,
24232423
lidac_mutual_min, lidac_mutual_max, lidac_mutual_ave,
24242424
gidac_self_rx, gidac_self_tx,
24252425
lidac_self_min, lidac_self_max, lidac_self_ave);
2426-
size += scnprintf(buf + size, PAGE_SIZE - size,
2426+
size += sysfs_emit_at(buf, size,
24272427
"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
24282428
raw_cap_mutual_min, raw_cap_mutual_max, raw_cap_mutual_ave,
24292429
raw_cap_self_min, raw_cap_self_max, raw_cap_self_ave,

drivers/input/mouse/cyapa_gen6.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -629,14 +629,14 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev,
629629
if (error)
630630
goto resume_scanning;
631631

632-
size = scnprintf(buf, PAGE_SIZE, "%d %d %d %d %d %d ",
633-
data[0], /* RX Attenuator Mutual */
634-
data[1], /* IDAC Mutual */
635-
data[2], /* RX Attenuator Self RX */
636-
data[3], /* IDAC Self RX */
637-
data[4], /* RX Attenuator Self TX */
638-
data[5] /* IDAC Self TX */
639-
);
632+
size = sysfs_emit(buf, "%d %d %d %d %d %d ",
633+
data[0], /* RX Attenuator Mutual */
634+
data[1], /* IDAC Mutual */
635+
data[2], /* RX Attenuator Self RX */
636+
data[3], /* IDAC Self RX */
637+
data[4], /* RX Attenuator Self TX */
638+
data[5] /* IDAC Self TX */
639+
);
640640

641641
/* 3. Read Attenuator Trim. */
642642
data_len = sizeof(data);
@@ -648,8 +648,8 @@ static ssize_t cyapa_gen6_show_baseline(struct device *dev,
648648

649649
/* set attenuator trim values. */
650650
for (i = 0; i < data_len; i++)
651-
size += scnprintf(buf + size, PAGE_SIZE - size, "%d ", data[i]);
652-
size += scnprintf(buf + size, PAGE_SIZE - size, "\n");
651+
size += sysfs_emit_at(buf, size, "%d ", data[i]);
652+
size += sysfs_emit_at(buf, size, "\n");
653653

654654
resume_scanning:
655655
/* 4. Resume Scanning*/

drivers/input/mouse/elan_i2c_core.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ static ssize_t elan_sysfs_read_fw_checksum(struct device *dev,
572572
struct i2c_client *client = to_i2c_client(dev);
573573
struct elan_tp_data *data = i2c_get_clientdata(client);
574574

575-
return sprintf(buf, "0x%04x\n", data->fw_checksum);
575+
return sysfs_emit(buf, "0x%04x\n", data->fw_checksum);
576576
}
577577

578578
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,
582582
struct i2c_client *client = to_i2c_client(dev);
583583
struct elan_tp_data *data = i2c_get_clientdata(client);
584584

585-
return sprintf(buf, ETP_PRODUCT_ID_FORMAT_STRING "\n",
586-
data->product_id);
585+
return sysfs_emit(buf, ETP_PRODUCT_ID_FORMAT_STRING "\n",
586+
data->product_id);
587587
}
588588

589589
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,
593593
struct i2c_client *client = to_i2c_client(dev);
594594
struct elan_tp_data *data = i2c_get_clientdata(client);
595595

596-
return sprintf(buf, "%d.0\n", data->fw_version);
596+
return sysfs_emit(buf, "%d.0\n", data->fw_version);
597597
}
598598

599599
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,
603603
struct i2c_client *client = to_i2c_client(dev);
604604
struct elan_tp_data *data = i2c_get_clientdata(client);
605605

606-
return sprintf(buf, "%d.0\n", data->sm_version);
606+
return sysfs_emit(buf, "%d.0\n", data->sm_version);
607607
}
608608

609609
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,
613613
struct i2c_client *client = to_i2c_client(dev);
614614
struct elan_tp_data *data = i2c_get_clientdata(client);
615615

616-
return sprintf(buf, "%d.0\n", data->iap_version);
616+
return sysfs_emit(buf, "%d.0\n", data->iap_version);
617617
}
618618

619619
static ssize_t elan_sysfs_update_fw(struct device *dev,
@@ -754,7 +754,7 @@ static ssize_t elan_sysfs_read_mode(struct device *dev,
754754
if (error)
755755
return error;
756756

757-
return sprintf(buf, "%d\n", (int)mode);
757+
return sysfs_emit(buf, "%d\n", (int)mode);
758758
}
759759

760760
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,
858858
goto out;
859859
}
860860

861-
retval = snprintf(buf, PAGE_SIZE, "%d", data->min_baseline);
861+
retval = sysfs_emit(buf, "%d", data->min_baseline);
862862

863863
out:
864864
mutex_unlock(&data->sysfs_mutex);
@@ -881,7 +881,7 @@ static ssize_t max_show(struct device *dev,
881881
goto out;
882882
}
883883

884-
retval = snprintf(buf, PAGE_SIZE, "%d", data->max_baseline);
884+
retval = sysfs_emit(buf, "%d", data->max_baseline);
885885

886886
out:
887887
mutex_unlock(&data->sysfs_mutex);

0 commit comments

Comments
 (0)