HID: 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>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
index a3b151b29bd711c2f87a6d4b6de8ac43b9219429..f675e1aa08c96cd0bc4e324132b0315db6c19b03 100644 (file)
--- a/drivers/hid/hid-steam.c
+++ b/drivers/hid/hid-steam.c
@@ -246,7 +246,7 @@ static int steam_get_serial(struct steam_device *steam)
        if (reply[0] != 0xae || reply[1] != 0x15 || reply[2] != 0x01)
                return -EIO;
        reply[3 + STEAM_SERIAL_LEN] = 0;
-       strlcpy(steam->serial_no, reply + 3, sizeof(steam->serial_no));
+       strscpy(steam->serial_no, reply + 3, sizeof(steam->serial_no));
        return 0;
 }
 
@@ -514,7 +514,7 @@ static int steam_register(struct steam_device *steam)
                 */
                mutex_lock(&steam->mutex);
                if (steam_get_serial(steam) < 0)
-                       strlcpy(steam->serial_no, "XXXXXXXXXX",
+                       strscpy(steam->serial_no, "XXXXXXXXXX",
                                        sizeof(steam->serial_no));
                mutex_unlock(&steam->mutex);
 
@@ -689,9 +689,9 @@ static struct hid_device *steam_create_client_hid(struct hid_device *hdev)
        client_hdev->version = hdev->version;
        client_hdev->type = hdev->type;
        client_hdev->country = hdev->country;
-       strlcpy(client_hdev->name, hdev->name,
+       strscpy(client_hdev->name, hdev->name,
                        sizeof(client_hdev->name));
-       strlcpy(client_hdev->phys, hdev->phys,
+       strscpy(client_hdev->phys, hdev->phys,
                        sizeof(client_hdev->phys));
        /*
         * Since we use the same device info than the real interface to

diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index c078f09a2318a04f528889bec961ef0a94739b20..347c80ec6fff24b595f083971582c1c71c4b87b8 100644 (file)
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -1036,7 +1036,7 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops,
 
        snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X",
                 client->name, (u16)hid->vendor, (u16)hid->product);
-       strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys));
+       strscpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys));
 
        ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product);
 

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 4490e2f7252ac7c55023c2d11a0384e5924e0128..be4c731aaa65daf68a7431f0165838c21ce0e9f7 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1381,7 +1381,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
                hid->type = HID_TYPE_USBNONE;
 
        if (dev->manufacturer)
-               strlcpy(hid->name, dev->manufacturer, sizeof(hid->name));
+               strscpy(hid->name, dev->manufacturer, sizeof(hid->name));
 
        if (dev->product) {
                if (dev->manufacturer)

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index b4b007c4beb6eb381262b24d8554f6e59decd108..c439ed2f16dbca3bbd229c2a631b41b8af7415fd 100644 (file)
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -294,7 +294,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
        spin_lock_init(&kbd->leds_lock);
 
        if (dev->manufacturer)
-               strlcpy(kbd->name, dev->manufacturer, sizeof(kbd->name));
+               strscpy(kbd->name, dev->manufacturer, sizeof(kbd->name));
 
        if (dev->product) {
                if (dev->manufacturer)

diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index fb1d7d1f6999465babfb2227663af968209d1a90..3fd93c2e4f4ad064106764264b7857e1f8f519dc 100644 (file)
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -142,7 +142,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
        mouse->dev = input_dev;
 
        if (dev->manufacturer)
-               strlcpy(mouse->name, dev->manufacturer, sizeof(mouse->name));
+               strscpy(mouse->name, dev->manufacturer, sizeof(mouse->name));
 
        if (dev->product) {
                if (dev->manufacturer)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 194a2e32759148da8a2afeffb6683365f80e44d0..102302e9afd996c254bfd7b9f69ceb48677bf88f 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2226,7 +2226,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)
                } else if (strstr(product_name, "Wacom") ||
                           strstr(product_name, "wacom") ||
                           strstr(product_name, "WACOM")) {
-                       strlcpy(name, product_name, sizeof(name));
+                       strscpy(name, product_name, sizeof(name));
                } else {
                        snprintf(name, sizeof(name), "Wacom %s", product_name);
                }
@@ -2244,7 +2244,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)
                if (name[strlen(name)-1] == ' ')
                        name[strlen(name)-1] = '\0';
        } else {
-               strlcpy(name, features->name, sizeof(name));
+               strscpy(name, features->name, sizeof(name));
        }
 
        snprintf(wacom_wac->name, sizeof(wacom_wac->name), "%s%s",
@@ -2509,7 +2509,7 @@ static void wacom_wireless_work(struct work_struct *work)
                                goto fail;
                }
 
-               strlcpy(wacom_wac->name, wacom_wac1->name,
+               strscpy(wacom_wac->name, wacom_wac1->name,
                        sizeof(wacom_wac->name));
                error = wacom_initialize_battery(wacom);
                if (error)