Input: touchscreen: use sysfs_emit() to instead of scnprintf()
PATCH v2 1/1 Input: touchscreen: use sysfs_emit() to instead of scnprintf()
From: ye xingchen <[email protected]>
Replace the open-code with sysfs_emit() to simplify the code.
---
v1 -> v2
fix the Subject.
drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++-- drivers/input/touchscreen/edt-ft5x06.c | 2 +- drivers/input/touchscreen/hideep.c | 4 ++-- drivers/input/touchscreen/hycon-hy46xx.c | 2 +- drivers/input/touchscreen/ilitek_ts_i2c.c | 4 ++-- drivers/input/touchscreen/iqs5xx.c | 2 +- drivers/input/touchscreen/usbtouchscreen.c | 2 +- drivers/input/touchscreen/wdt87xx_i2c.c | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-)
drivers/input/touchscreen/atmel_mxt_ts.c +2 -2
@@ -2761,7 +2761,7 @@ static ssize_t mxt_fw_version_show(struct device *dev, {struct mxt_data *data =dev_get_drvdata (dev);struct mxt_info *info = data->info; -return scnprintf (buf,PAGE_SIZE ,"%u.%u.%02X\n" , +return sysfs_emit (buf,"%u.%u.%02X\n" , info->version >>4 , info->version &0xf , info->build); }
@@ -2771,7 +2771,7 @@ static ssize_t mxt_hw_version_show(struct device *dev, {struct mxt_data *data =dev_get_drvdata (dev);struct mxt_info *info = data->info; -return scnprintf (buf,PAGE_SIZE ,"%u.%u\n" , +return sysfs_emit (buf,"%u.%u\n" , info->family_id, info->variant_id); }
drivers/input/touchscreen/edt-ft5x06.c +1 -1
@@ -445,7 +445,7 @@ static ssize_t edt_ft5x06_setting_show(struct device *dev, *field = val; } - count =scnprintf (buf,PAGE_SIZE ,"%d\n" , val); + count =sysfs_emit (buf,"%d\n" , val); out:mutex_unlock (&tsdata->mutex);return error ?: count;
drivers/input/touchscreen/hideep.c +2 -2
@@ -922,7 +922,7 @@ static ssize_t hideep_fw_version_show(struct device *dev,ssize_t len;mutex_lock (&ts->dev_mutex); - len =scnprintf (buf,PAGE_SIZE ,"%04x\n" , + len =sysfs_emit (buf,"%04x\n" ,be16_to_cpu (ts->dwz_info.release_ver));mutex_unlock (&ts->dev_mutex);
@@ -937,7 +937,7 @@ static ssize_t hideep_product_id_show(struct device *dev,ssize_t len;mutex_lock (&ts->dev_mutex); - len =scnprintf (buf,PAGE_SIZE ,"%04x\n" , + len =sysfs_emit (buf,"%04x\n" ,be16_to_cpu (ts->dwz_info.product_id));mutex_unlock (&ts->dev_mutex);
drivers/input/touchscreen/hycon-hy46xx.c +1 -1
@@ -202,7 +202,7 @@ static ssize_t hycon_hy46xx_setting_show(struct device *dev, *field = val; } - count =scnprintf (buf,PAGE_SIZE ,"%d\n" , val); + count =sysfs_emit (buf,"%d\n" , val); out:mutex_unlock (&tsdata->mutex);
drivers/input/touchscreen/ilitek_ts_i2c.c +2 -2
@@ -512,7 +512,7 @@ static ssize_t firmware_version_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct ilitek_ts_data *ts =i2c_get_clientdata (client); - return scnprintf(buf, PAGE_SIZE, + return sysfs_emit(buf, "fw version: [%02X%02X.%02X%02X.%02X%02X.%02X%02X]\n", ts->firmware_ver[0], ts->firmware_ver[1], ts->firmware_ver[2], ts->firmware_ver[3],
@@ -527,7 +527,7 @@ static ssize_t product_id_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct ilitek_ts_data *ts =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"product id: [%04X], module: [%s]\n" , +return sysfs_emit (buf,"product id: [%04X], module: [%s]\n" , ts->mcu_ver, ts->product_id); }static DEVICE_ATTR_RO (product_id);
drivers/input/touchscreen/iqs5xx.c +1 -1
@@ -943,7 +943,7 @@ static ssize_t fw_info_show(struct device *dev,if (!iqs5xx->dev_id_info.bl_status)return -ENODATA ; - return scnprintf(buf, PAGE_SIZE, "%u.%u.%u.%u:%u.%u\n", + return sysfs_emit(buf, "%u.%u.%u.%u:%u.%u\n", be16_to_cpu(iqs5xx->dev_id_info.prod_num), be16_to_cpu(iqs5xx->dev_id_info.proj_num), iqs5xx->dev_id_info.major_ver,
drivers/input/touchscreen/usbtouchscreen.c +1 -1
@@ -456,7 +456,7 @@ static ssize_t mtouch_firmware_rev_show(struct device *dev,struct usbtouch_usb *usbtouch =usb_get_intfdata (intf);struct mtouch_priv *priv = usbtouch->priv; -return scnprintf (output,PAGE_SIZE ,"%1x.%1x\n" , +return sysfs_emit (output,"%1x.%1x\n" , priv->fw_rev_major, priv->fw_rev_minor); } static DEVICE_ATTR(firmware_rev, 0444, mtouch_firmware_rev_show, NULL);
drivers/input/touchscreen/wdt87xx_i2c.c +3 -3
@@ -887,7 +887,7 @@ static ssize_t config_csum_show(struct device *dev, cfg_csum = wdt->param.xmls_id1; cfg_csum = (cfg_csum <<16 ) | wdt->param.xmls_id2; -return scnprintf (buf,PAGE_SIZE ,"%x\n" , cfg_csum); +return sysfs_emit (buf,"%x\n" , cfg_csum); } static ssize_t fw_version_show(struct device *dev,
@@ -896,7 +896,7 @@ static ssize_t fw_version_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct wdt87xx_data *wdt =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"%x\n" , wdt->param.fw_id); +return sysfs_emit (buf,"%x\n" , wdt->param.fw_id); } static ssize_t plat_id_show(struct device *dev,
@@ -905,7 +905,7 @@ static ssize_t plat_id_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct wdt87xx_data *wdt =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"%x\n" , wdt->param.plat_id); +return sysfs_emit (buf,"%x\n" , wdt->param.plat_id); } static ssize_t update_config_store(struct device *dev,
Signature · 1 line
2.25.1
Hello,
Quoted 5 lines · On Thu, Dec 01, 2022 at 07:04:19PM +0800, [email protected] wrote:
From: ye xingchen <[email protected]>
Replace the open-code with
sysfs_emit()to simplify the code.Signed-off-by ye xingchen <[email protected]>
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Hi Ye,
Quoted 5 lines · On Thu, Dec 01, 2022 at 07:04:19PM +0800, [email protected] wrote:
From: ye xingchen <[email protected]>
Replace the open-code with
sysfs_emit()to simplify the code.Signed-off-by ye xingchen <[email protected]>
My comment is arguably cosmetic, but this patch distorts all of the vertical alignment in these drivers. Example below.
Quoted 18 lines
---
v1 -> v2
fix the Subject.drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++-- drivers/input/touchscreen/edt-ft5x06.c | 2 +- drivers/input/touchscreen/hideep.c | 4 ++-- drivers/input/touchscreen/hycon-hy46xx.c | 2 +- drivers/input/touchscreen/ilitek_ts_i2c.c | 4 ++-- drivers/input/touchscreen/iqs5xx.c | 2 +- drivers/input/touchscreen/usbtouchscreen.c | 2 +- drivers/input/touchscreen/wdt87xx_i2c.c | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-)drivers/input/touchscreen/atmel_mxt_ts.c +0
-0
drivers/input/touchscreen/atmel_mxt_ts.c static ssize_t mxt_fw_version_show(struct device *dev, · line 2765
Quoted 6 lines
drivers/input/touchscreen/atmel_mxt_ts.c +1
-1@@ -2761,7 +2761,7 @@ static ssize_t mxt_fw_version_show(struct device *dev, {struct mxt_data *data =dev_get_drvdata (dev);struct mxt_info *info = data->info; -return scnprintf (buf,PAGE_SIZE ,"%u.%u.%02X\n" , +return sysfs_emit (buf,"%u.%u.%02X\n" , info->version >>4 , info->version &0xf , info->build);
When applied locally, this apperas as:
return sysfs_emit(buf, ...
info->family_id,...
The original authors, myself included, spaced the second line over just enough to be aligned and hence more readable. Please maintain the same here.
In some cases, you may also be able to avoid a line break now that PAGE_SIZE is no longer taking up space.
Quoted 140 lines
drivers/input/touchscreen/atmel_mxt_ts.c +1
-1}@@ -2771,7 +2771,7 @@ static ssize_t mxt_hw_version_show(struct device *dev, {struct mxt_data *data =dev_get_drvdata (dev);struct mxt_info *info = data->info; -return scnprintf (buf,PAGE_SIZE ,"%u.%u\n" , +return sysfs_emit (buf,"%u.%u\n" , info->family_id, info->variant_id); }drivers/input/touchscreen/edt-ft5x06.c +1
-1@@ -445,7 +445,7 @@ static ssize_t edt_ft5x06_setting_show(struct device *dev, *field = val; } - count =scnprintf (buf,PAGE_SIZE ,"%d\n" , val); + count =sysfs_emit (buf,"%d\n" , val); out:mutex_unlock (&tsdata->mutex);return error ?: count;drivers/input/touchscreen/hideep.c +2
-2@@ -922,7 +922,7 @@ static ssize_t hideep_fw_version_show(struct device *dev,ssize_t len;mutex_lock (&ts->dev_mutex); - len =scnprintf (buf,PAGE_SIZE ,"%04x\n" , + len =sysfs_emit (buf,"%04x\n" ,be16_to_cpu (ts->dwz_info.release_ver));mutex_unlock (&ts->dev_mutex);@@ -937,7 +937,7 @@ static ssize_t hideep_product_id_show(struct device *dev,ssize_t len;mutex_lock (&ts->dev_mutex); - len =scnprintf (buf,PAGE_SIZE ,"%04x\n" , + len =sysfs_emit (buf,"%04x\n" ,be16_to_cpu (ts->dwz_info.product_id));mutex_unlock (&ts->dev_mutex);drivers/input/touchscreen/hycon-hy46xx.c +1
-1@@ -202,7 +202,7 @@ static ssize_t hycon_hy46xx_setting_show(struct device *dev, *field = val; } - count =scnprintf (buf,PAGE_SIZE ,"%d\n" , val); + count =sysfs_emit (buf,"%d\n" , val); out:mutex_unlock (&tsdata->mutex);drivers/input/touchscreen/ilitek_ts_i2c.c +2
-2@@ -512,7 +512,7 @@ static ssize_t firmware_version_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct ilitek_ts_data *ts =i2c_get_clientdata (client); - return scnprintf(buf, PAGE_SIZE, + return sysfs_emit(buf, "fw version: [%02X%02X.%02X%02X.%02X%02X.%02X%02X]\n", ts->firmware_ver[0], ts->firmware_ver[1], ts->firmware_ver[2], ts->firmware_ver[3],@@ -527,7 +527,7 @@ static ssize_t product_id_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct ilitek_ts_data *ts =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"product id: [%04X], module: [%s]\n" , +return sysfs_emit (buf,"product id: [%04X], module: [%s]\n" , ts->mcu_ver, ts->product_id); }static DEVICE_ATTR_RO (product_id);drivers/input/touchscreen/iqs5xx.c +1
-1@@ -943,7 +943,7 @@ static ssize_t fw_info_show(struct device *dev,if (!iqs5xx->dev_id_info.bl_status)return -ENODATA ; - return scnprintf(buf, PAGE_SIZE, "%u.%u.%u.%u:%u.%u\n", + return sysfs_emit(buf, "%u.%u.%u.%u:%u.%u\n", be16_to_cpu(iqs5xx->dev_id_info.prod_num), be16_to_cpu(iqs5xx->dev_id_info.proj_num), iqs5xx->dev_id_info.major_ver,drivers/input/touchscreen/usbtouchscreen.c +1
-1@@ -456,7 +456,7 @@ static ssize_t mtouch_firmware_rev_show(struct device *dev,struct usbtouch_usb *usbtouch =usb_get_intfdata (intf);struct mtouch_priv *priv = usbtouch->priv; -return scnprintf (output,PAGE_SIZE ,"%1x.%1x\n" , +return sysfs_emit (output,"%1x.%1x\n" , priv->fw_rev_major, priv->fw_rev_minor); } static DEVICE_ATTR(firmware_rev, 0444, mtouch_firmware_rev_show, NULL);drivers/input/touchscreen/wdt87xx_i2c.c +3
-3@@ -887,7 +887,7 @@ static ssize_t config_csum_show(struct device *dev, cfg_csum = wdt->param.xmls_id1; cfg_csum = (cfg_csum <<16 ) | wdt->param.xmls_id2; -return scnprintf (buf,PAGE_SIZE ,"%x\n" , cfg_csum); +return sysfs_emit (buf,"%x\n" , cfg_csum); } static ssize_t fw_version_show(struct device *dev,@@ -896,7 +896,7 @@ static ssize_t fw_version_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct wdt87xx_data *wdt =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"%x\n" , wdt->param.fw_id); +return sysfs_emit (buf,"%x\n" , wdt->param.fw_id); } static ssize_t plat_id_show(struct device *dev,@@ -905,7 +905,7 @@ static ssize_t plat_id_show(struct device *dev,struct i2c_client *client =to_i2c_client (dev);struct wdt87xx_data *wdt =i2c_get_clientdata (client); -return scnprintf (buf,PAGE_SIZE ,"%x\n" , wdt->param.plat_id); +return sysfs_emit (buf,"%x\n" , wdt->param.plat_id); } static ssize_t update_config_store(struct device *dev,Signature · 1 line
2.25.1
Kind regards,
Jeff LaBundy