Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

ye xingchen and committed by
Dmitry Torokhov
1864a200 d4db8762

+33 -33
+11 -11
drivers/input/mouse/cyapa.c
··· 756 756 757 757 switch (pwr_cmd) { 758 758 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); 760 760 break; 761 761 762 762 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); 764 764 break; 765 765 766 766 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 ? 769 769 cyapa_pwr_cmd_to_sleep_time(pwr_cmd) : 770 770 sleep_time); 771 771 break; ··· 877 877 878 878 mutex_unlock(&cyapa->state_sync_lock); 879 879 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 ? 882 882 cyapa_pwr_cmd_to_sleep_time(pwr_cmd) : 883 883 sleep_time); 884 884 } ··· 988 988 error = mutex_lock_interruptible(&cyapa->state_sync_lock); 989 989 if (error) 990 990 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); 993 993 mutex_unlock(&cyapa->state_sync_lock); 994 994 return error; 995 995 } ··· 1004 1004 error = mutex_lock_interruptible(&cyapa->state_sync_lock); 1005 1005 if (error) 1006 1006 return error; 1007 - size = scnprintf(buf, PAGE_SIZE, "%s\n", cyapa->product_id); 1007 + size = sysfs_emit(buf, "%s\n", cyapa->product_id); 1008 1008 mutex_unlock(&cyapa->state_sync_lock); 1009 1009 return size; 1010 1010 } ··· 1209 1209 if (error) 1210 1210 return error; 1211 1211 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)); 1214 1214 1215 1215 mutex_unlock(&cyapa->state_sync_lock); 1216 1216 return size;
+1 -1
drivers/input/mouse/cyapa_gen3.c
··· 860 860 861 861 dev_dbg(dev, "Baseline report successful. Max: %d Min: %d\n", 862 862 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); 864 864 865 865 out: 866 866 return ret;
+2 -2
drivers/input/mouse/cyapa_gen5.c
··· 2418 2418 return resume_error ? resume_error : error; 2419 2419 2420 2420 /* 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 ", 2422 2422 gidac_mutual_min, gidac_mutual_max, gidac_mutual_ave, 2423 2423 lidac_mutual_min, lidac_mutual_max, lidac_mutual_ave, 2424 2424 gidac_self_rx, gidac_self_tx, 2425 2425 lidac_self_min, lidac_self_max, lidac_self_ave); 2426 - size += scnprintf(buf + size, PAGE_SIZE - size, 2426 + size += sysfs_emit_at(buf, size, 2427 2427 "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", 2428 2428 raw_cap_mutual_min, raw_cap_mutual_max, raw_cap_mutual_ave, 2429 2429 raw_cap_self_min, raw_cap_self_max, raw_cap_self_ave,
+10 -10
drivers/input/mouse/cyapa_gen6.c
··· 629 629 if (error) 630 630 goto resume_scanning; 631 631 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 + ); 640 640 641 641 /* 3. Read Attenuator Trim. */ 642 642 data_len = sizeof(data); ··· 648 648 649 649 /* set attenuator trim values. */ 650 650 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"); 653 653 654 654 resume_scanning: 655 655 /* 4. Resume Scanning*/
+9 -9
drivers/input/mouse/elan_i2c_core.c
··· 572 572 struct i2c_client *client = to_i2c_client(dev); 573 573 struct elan_tp_data *data = i2c_get_clientdata(client); 574 574 575 - return sprintf(buf, "0x%04x\n", data->fw_checksum); 575 + return sysfs_emit(buf, "0x%04x\n", data->fw_checksum); 576 576 } 577 577 578 578 static ssize_t elan_sysfs_read_product_id(struct device *dev, ··· 582 582 struct i2c_client *client = to_i2c_client(dev); 583 583 struct elan_tp_data *data = i2c_get_clientdata(client); 584 584 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); 587 587 } 588 588 589 589 static ssize_t elan_sysfs_read_fw_ver(struct device *dev, ··· 593 593 struct i2c_client *client = to_i2c_client(dev); 594 594 struct elan_tp_data *data = i2c_get_clientdata(client); 595 595 596 - return sprintf(buf, "%d.0\n", data->fw_version); 596 + return sysfs_emit(buf, "%d.0\n", data->fw_version); 597 597 } 598 598 599 599 static ssize_t elan_sysfs_read_sm_ver(struct device *dev, ··· 603 603 struct i2c_client *client = to_i2c_client(dev); 604 604 struct elan_tp_data *data = i2c_get_clientdata(client); 605 605 606 - return sprintf(buf, "%d.0\n", data->sm_version); 606 + return sysfs_emit(buf, "%d.0\n", data->sm_version); 607 607 } 608 608 609 609 static ssize_t elan_sysfs_read_iap_ver(struct device *dev, ··· 613 613 struct i2c_client *client = to_i2c_client(dev); 614 614 struct elan_tp_data *data = i2c_get_clientdata(client); 615 615 616 - return sprintf(buf, "%d.0\n", data->iap_version); 616 + return sysfs_emit(buf, "%d.0\n", data->iap_version); 617 617 } 618 618 619 619 static ssize_t elan_sysfs_update_fw(struct device *dev, ··· 754 754 if (error) 755 755 return error; 756 756 757 - return sprintf(buf, "%d\n", (int)mode); 757 + return sysfs_emit(buf, "%d\n", (int)mode); 758 758 } 759 759 760 760 static DEVICE_ATTR(product_id, S_IRUGO, elan_sysfs_read_product_id, NULL); ··· 858 858 goto out; 859 859 } 860 860 861 - retval = snprintf(buf, PAGE_SIZE, "%d", data->min_baseline); 861 + retval = sysfs_emit(buf, "%d", data->min_baseline); 862 862 863 863 out: 864 864 mutex_unlock(&data->sysfs_mutex); ··· 881 881 goto out; 882 882 } 883 883 884 - retval = snprintf(buf, PAGE_SIZE, "%d", data->max_baseline); 884 + retval = sysfs_emit(buf, "%d", data->max_baseline); 885 885 886 886 out: 887 887 mutex_unlock(&data->sysfs_mutex);