platform/x86: move from strlcpy with unused retval to strscpy

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20220818210058.7229-1-wsa+renesas@sang-engineering.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index 444ec81ba02d78cc88666a392eaf8569a425be0b..4c53d116d59b63a85d2a8e98353e981784e6fa9f 100644 (file)
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -519,7 +519,7 @@ static int mshw0011_probe(struct i2c_client *client)
        i2c_set_clientdata(client, data);
 
        memset(&board_info, 0, sizeof(board_info));
-       strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
+       strscpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
 
        bat0 = i2c_acpi_new_device(dev, 1, &board_info);
        if (IS_ERR(bat0))

diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
index 636bdfa83284d50acc239f88b01c76359d75f920..0a6411a8a104c52973a5b9e17614751d86744b8f 100644 (file)
--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -270,7 +270,7 @@ void strlcpy_attr(char *dest, char *src)
        size_t len = strlen(src) + 1;
 
        if (len > 1 && len <= MAX_BUFF)
-               strlcpy(dest, src, len);
+               strscpy(dest, src, len);
 
        /*len can be zero because any property not-applicable to attribute can
         * be empty so check only for too long buffers and log error

diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c
index c52ac23e233157108dbbbe04cb864a780f96ccf1..1ea989df513cd898fcfafb7d962099a74c295c06 100644 (file)
--- a/drivers/platform/x86/intel/chtwc_int33fe.c
+++ b/drivers/platform/x86/intel/chtwc_int33fe.c
@@ -270,7 +270,7 @@ cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
        }
 
        memset(&board_info, 0, sizeof(board_info));
-       strlcpy(board_info.type, "max17047", I2C_NAME_SIZE);
+       strscpy(board_info.type, "max17047", I2C_NAME_SIZE);
        board_info.dev_name = "max17047";
        board_info.fwnode = fwnode;
        data->battery_fg = i2c_acpi_new_device(dev, 1, &board_info);
@@ -361,7 +361,7 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
        }
 
        memset(&board_info, 0, sizeof(board_info));
-       strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
+       strscpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
        board_info.dev_name = "fusb302";
        board_info.fwnode = fwnode;
        board_info.irq = fusb302_irq;
@@ -381,7 +381,7 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
        memset(&board_info, 0, sizeof(board_info));
        board_info.dev_name = "pi3usb30532";
        board_info.fwnode = fwnode;
-       strlcpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
+       strscpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
 
        data->pi3usb30532 = i2c_acpi_new_device(dev, 3, &board_info);
        if (IS_ERR(data->pi3usb30532)) {

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 22d4e8633e30e953cec9a558751bd218f17ce26c..8dad0428a83cfd7779108c6600cf2df6e63afb74 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -7623,9 +7623,9 @@ static int __init volume_create_alsa_mixer(void)
        data = card->private_data;
        data->card = card;
 
-       strlcpy(card->driver, TPACPI_ALSA_DRVNAME,
+       strscpy(card->driver, TPACPI_ALSA_DRVNAME,
                sizeof(card->driver));
-       strlcpy(card->shortname, TPACPI_ALSA_SHRTNAME,
+       strscpy(card->shortname, TPACPI_ALSA_SHRTNAME,
                sizeof(card->shortname));
        snprintf(card->mixername, sizeof(card->mixername), "ThinkPad EC %s",
                 (thinkpad_id.ec_version_str) ?