iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: move from strlcpy with unused retval to strscpy

Browse Source 
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.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210022.6865-1-wsa+renesas@sang-engineering.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Wolfram Sang 2022-08-18 15:05:06 -07:00 committed by Dmitry Torokhov
parent 24c06e000e
commit a9f08ad7ad
35 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/keyboard/lkkbd.c
View File

@ -359,18 +359,18 @@ static void lkkbd_detection_done(struct lkkbd *lk)
*/ */
switch (lk->id[4]) { switch (lk->id[4]) {
case 1: case 1:
strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name)); strscpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name));
if (lk201_compose_is_alt) if (lk201_compose_is_alt)
lk->keycode[0xb1] = KEY_LEFTALT; lk->keycode[0xb1] = KEY_LEFTALT;
break; break;
case 2: case 2:
strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name)); strscpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name));
break; break;
default: default:
strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name)); strscpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name));
printk(KERN_ERR printk(KERN_ERR
"lkkbd: keyboard on %s is unknown, please report to " "lkkbd: keyboard on %s is unknown, please report to "
"Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys); "Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys);
@ -626,7 +626,7 @@ static int lkkbd_connect(struct serio *serio, struct serio_driver *drv)
lk->ctrlclick_volume = ctrlclick_volume; lk->ctrlclick_volume = ctrlclick_volume;
memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode)); memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode));
strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name)); strscpy(lk->name, "DEC LK keyboard", sizeof(lk->name));
snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys); snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys);
input_dev->name = lk->name; input_dev->name = lk->name;

2
drivers/input/misc/keyspan_remote.c
View File

@ -485,7 +485,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
} }
if (udev->manufacturer) if (udev->manufacturer)
strlcpy(remote->name, udev->manufacturer, sizeof(remote->name)); strscpy(remote->name, udev->manufacturer, sizeof(remote->name));
if (udev->product) { if (udev->product) {
if (udev->manufacturer) if (udev->manufacturer)

2
drivers/input/mouse/hgpk.c
View File

@ -1057,7 +1057,7 @@ void hgpk_module_init(void)
strlen(hgpk_mode_name)); strlen(hgpk_mode_name));
if (hgpk_default_mode == HGPK_MODE_INVALID) { if (hgpk_default_mode == HGPK_MODE_INVALID) {
hgpk_default_mode = HGPK_MODE_MOUSE; hgpk_default_mode = HGPK_MODE_MOUSE;
strlcpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE], strscpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE],
sizeof(hgpk_mode_name)); sizeof(hgpk_mode_name));
} }
} }

4
drivers/input/mouse/synaptics.c
View File

@ -715,8 +715,8 @@ static void synaptics_pt_create(struct psmouse *psmouse)
} }
serio->id.type = SERIO_PS_PSTHRU; serio->id.type = SERIO_PS_PSTHRU;
strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name)); strscpy(serio->name, "Synaptics pass-through", sizeof(serio->name));
strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys)); strscpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys));
serio->write = synaptics_pt_write; serio->write = synaptics_pt_write;
serio->start = synaptics_pt_start; serio->start = synaptics_pt_start;
serio->stop = synaptics_pt_stop; serio->stop = synaptics_pt_stop;

2
drivers/input/mouse/synaptics_usb.c
View File

@ -354,7 +354,7 @@ static int synusb_probe(struct usb_interface *intf,
synusb->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; synusb->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
if (udev->manufacturer) if (udev->manufacturer)
strlcpy(synusb->name, udev->manufacturer, strscpy(synusb->name, udev->manufacturer,
sizeof(synusb->name)); sizeof(synusb->name));
if (udev->product) { if (udev->product) {

4
drivers/input/mouse/vsxxxaa.c
View File

@ -138,12 +138,12 @@ static void vsxxxaa_detection_done(struct vsxxxaa *mouse)
{ {
switch (mouse->type) { switch (mouse->type) {
case 0x02: case 0x02:
strlcpy(mouse->name, "DEC VSXXX-AA/-GA mouse", strscpy(mouse->name, "DEC VSXXX-AA/-GA mouse",
sizeof(mouse->name)); sizeof(mouse->name));
break; break;
case 0x04: case 0x04:
strlcpy(mouse->name, "DEC VSXXX-AB digitizer", strscpy(mouse->name, "DEC VSXXX-AB digitizer",
sizeof(mouse->name)); sizeof(mouse->name));
break; break;

2
drivers/input/rmi4/rmi_f03.c
View File

@ -181,7 +181,7 @@ static int rmi_f03_register_pt(struct f03_data *f03)
serio->close = rmi_f03_pt_close; serio->close = rmi_f03_pt_close;
serio->port_data = f03; serio->port_data = f03;
strlcpy(serio->name, "RMI4 PS/2 pass-through", sizeof(serio->name)); strscpy(serio->name, "RMI4 PS/2 pass-through", sizeof(serio->name));
snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", snprintf(serio->phys, sizeof(serio->phys), "%s/serio0",
dev_name(&f03->fn->dev)); dev_name(&f03->fn->dev));
serio->dev.parent = &f03->fn->dev; serio->dev.parent = &f03->fn->dev;

8
drivers/input/rmi4/rmi_f54.c
View File

@ -390,8 +390,8 @@ static int rmi_f54_vidioc_querycap(struct file *file, void *priv,
{ {
struct f54_data *f54 = video_drvdata(file); struct f54_data *f54 = video_drvdata(file);
strlcpy(cap->driver, F54_NAME, sizeof(cap->driver)); strscpy(cap->driver, F54_NAME, sizeof(cap->driver));
strlcpy(cap->card, SYNAPTICS_INPUT_DEVICE_NAME, sizeof(cap->card)); strscpy(cap->card, SYNAPTICS_INPUT_DEVICE_NAME, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf(cap->bus_info, sizeof(cap->bus_info),
"rmi4:%s", dev_name(&f54->fn->dev)); "rmi4:%s", dev_name(&f54->fn->dev));
@ -410,7 +410,7 @@ static int rmi_f54_vidioc_enum_input(struct file *file, void *priv,
i->type = V4L2_INPUT_TYPE_TOUCH; i->type = V4L2_INPUT_TYPE_TOUCH;
strlcpy(i->name, rmi_f54_report_type_names[reptype], sizeof(i->name)); strscpy(i->name, rmi_f54_report_type_names[reptype], sizeof(i->name));
return 0; return 0;
} }
@ -696,7 +696,7 @@ static int rmi_f54_probe(struct rmi_function *fn)
rmi_f54_set_input(f54, 0); rmi_f54_set_input(f54, 0);
/* register video device */ /* register video device */
strlcpy(f54->v4l2.name, F54_NAME, sizeof(f54->v4l2.name)); strscpy(f54->v4l2.name, F54_NAME, sizeof(f54->v4l2.name));
ret = v4l2_device_register(&fn->dev, &f54->v4l2); ret = v4l2_device_register(&fn->dev, &f54->v4l2);
if (ret) { if (ret) {
dev_err(&fn->dev, "Unable to register video dev.\n"); dev_err(&fn->dev, "Unable to register video dev.\n");

4
drivers/input/serio/altera_ps2.c
View File

@ -110,8 +110,8 @@ static int altera_ps2_probe(struct platform_device *pdev)
serio->write = altera_ps2_write; serio->write = altera_ps2_write;
serio->open = altera_ps2_open; serio->open = altera_ps2_open;
serio->close = altera_ps2_close; serio->close = altera_ps2_close;
strlcpy(serio->name, dev_name(&pdev->dev), sizeof(serio->name)); strscpy(serio->name, dev_name(&pdev->dev), sizeof(serio->name));
strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys));
serio->port_data = ps2if; serio->port_data = ps2if;
serio->dev.parent = &pdev->dev; serio->dev.parent = &pdev->dev;
ps2if->io = serio; ps2if->io = serio;

4
drivers/input/serio/ambakmi.c
View File

@ -126,8 +126,8 @@ static int amba_kmi_probe(struct amba_device *dev,
io->write = amba_kmi_write; io->write = amba_kmi_write;
io->open = amba_kmi_open; io->open = amba_kmi_open;
io->close = amba_kmi_close; io->close = amba_kmi_close;
strlcpy(io->name, dev_name(&dev->dev), sizeof(io->name)); strscpy(io->name, dev_name(&dev->dev), sizeof(io->name));
strlcpy(io->phys, dev_name(&dev->dev), sizeof(io->phys)); strscpy(io->phys, dev_name(&dev->dev), sizeof(io->phys));
io->port_data = kmi; io->port_data = kmi;
io->dev.parent = &dev->dev; io->dev.parent = &dev->dev;

4
drivers/input/serio/ams_delta_serio.c
View File

@ -159,8 +159,8 @@ static int ams_delta_serio_init(struct platform_device *pdev)
serio->id.type = SERIO_8042; serio->id.type = SERIO_8042;
serio->open = ams_delta_serio_open; serio->open = ams_delta_serio_open;
serio->close = ams_delta_serio_close; serio->close = ams_delta_serio_close;
strlcpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name)); strscpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name));
strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys));
serio->dev.parent = &pdev->dev; serio->dev.parent = &pdev->dev;
serio->port_data = priv; serio->port_data = priv;

2
drivers/input/serio/apbps2.c
View File

@ -176,7 +176,7 @@ static int apbps2_of_probe(struct platform_device *ofdev)
priv->io->close = apbps2_close; priv->io->close = apbps2_close;
priv->io->write = apbps2_write; priv->io->write = apbps2_write;
priv->io->port_data = priv; priv->io->port_data = priv;
strlcpy(priv->io->name, "APBPS2 PS/2", sizeof(priv->io->name)); strscpy(priv->io->name, "APBPS2 PS/2", sizeof(priv->io->name));
snprintf(priv->io->phys, sizeof(priv->io->phys), snprintf(priv->io->phys, sizeof(priv->io->phys),
"apbps2_%d", apbps2_idx++); "apbps2_%d", apbps2_idx++);

2
drivers/input/serio/ct82c710.c
View File

@ -170,7 +170,7 @@ static int ct82c710_probe(struct platform_device *dev)
ct82c710_port->open = ct82c710_open; ct82c710_port->open = ct82c710_open;
ct82c710_port->close = ct82c710_close; ct82c710_port->close = ct82c710_close;
ct82c710_port->write = ct82c710_write; ct82c710_port->write = ct82c710_write;
strlcpy(ct82c710_port->name, "C&T 82c710 mouse port", strscpy(ct82c710_port->name, "C&T 82c710 mouse port",
sizeof(ct82c710_port->name)); sizeof(ct82c710_port->name));
snprintf(ct82c710_port->phys, sizeof(ct82c710_port->phys), snprintf(ct82c710_port->phys, sizeof(ct82c710_port->phys),
"isa%16llx/serio0", (unsigned long long)CT82C710_DATA); "isa%16llx/serio0", (unsigned long long)CT82C710_DATA);

2
drivers/input/serio/gscps2.c
View File

@ -361,7 +361,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
snprintf(serio->name, sizeof(serio->name), "gsc-ps2-%s", snprintf(serio->name, sizeof(serio->name), "gsc-ps2-%s",
(ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse");
strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys));
serio->id.type = SERIO_8042; serio->id.type = SERIO_8042;
serio->write = gscps2_write; serio->write = gscps2_write;
serio->open = gscps2_open; serio->open = gscps2_open;

4
drivers/input/serio/hyperv-keyboard.c
View File

@ -334,9 +334,9 @@ static int hv_kbd_probe(struct hv_device *hv_dev,
hv_serio->dev.parent = &hv_dev->device; hv_serio->dev.parent = &hv_dev->device;
hv_serio->id.type = SERIO_8042_XL; hv_serio->id.type = SERIO_8042_XL;
hv_serio->port_data = kbd_dev; hv_serio->port_data = kbd_dev;
strlcpy(hv_serio->name, dev_name(&hv_dev->device), strscpy(hv_serio->name, dev_name(&hv_dev->device),
sizeof(hv_serio->name)); sizeof(hv_serio->name));
strlcpy(hv_serio->phys, dev_name(&hv_dev->device), strscpy(hv_serio->phys, dev_name(&hv_dev->device),
sizeof(hv_serio->phys)); sizeof(hv_serio->phys));
hv_serio->start = hv_kbd_start; hv_serio->start = hv_kbd_start;

6
drivers/input/serio/i8042-x86ia64io.h
View File

@ -1300,7 +1300,7 @@ static char i8042_pnp_aux_name[32];
static void i8042_pnp_id_to_string(struct pnp_id *id, char *dst, int dst_size) static void i8042_pnp_id_to_string(struct pnp_id *id, char *dst, int dst_size)
{ {
strlcpy(dst, "PNP:", dst_size); strscpy(dst, "PNP:", dst_size);
while (id) { while (id) {
strlcat(dst, " ", dst_size); strlcat(dst, " ", dst_size);
@ -1320,7 +1320,7 @@ static int i8042_pnp_kbd_probe(struct pnp_dev *dev, const struct pnp_device_id *
if (pnp_irq_valid(dev,0)) if (pnp_irq_valid(dev,0))
i8042_pnp_kbd_irq = pnp_irq(dev, 0); i8042_pnp_kbd_irq = pnp_irq(dev, 0);
strlcpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name)); strscpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name));
if (strlen(pnp_dev_name(dev))) { if (strlen(pnp_dev_name(dev))) {
strlcat(i8042_pnp_kbd_name, ":", sizeof(i8042_pnp_kbd_name)); strlcat(i8042_pnp_kbd_name, ":", sizeof(i8042_pnp_kbd_name));
strlcat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name)); strlcat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name));
@ -1347,7 +1347,7 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
if (pnp_irq_valid(dev, 0)) if (pnp_irq_valid(dev, 0))
i8042_pnp_aux_irq = pnp_irq(dev, 0); i8042_pnp_aux_irq = pnp_irq(dev, 0);
strlcpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name)); strscpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name));
if (strlen(pnp_dev_name(dev))) { if (strlen(pnp_dev_name(dev))) {
strlcat(i8042_pnp_aux_name, ":", sizeof(i8042_pnp_aux_name)); strlcat(i8042_pnp_aux_name, ":", sizeof(i8042_pnp_aux_name));
strlcat(i8042_pnp_aux_name, pnp_dev_name(dev), sizeof(i8042_pnp_aux_name)); strlcat(i8042_pnp_aux_name, pnp_dev_name(dev), sizeof(i8042_pnp_aux_name));

14
drivers/input/serio/i8042.c
View File

@ -1341,9 +1341,9 @@ static int i8042_create_kbd_port(void)
serio->ps2_cmd_mutex = &i8042_mutex; serio->ps2_cmd_mutex = &i8042_mutex;
serio->port_data = port; serio->port_data = port;
serio->dev.parent = &i8042_platform_device->dev; serio->dev.parent = &i8042_platform_device->dev;
strlcpy(serio->name, "i8042 KBD port", sizeof(serio->name)); strscpy(serio->name, "i8042 KBD port", sizeof(serio->name));
strlcpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys)); strscpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys));
strlcpy(serio->firmware_id, i8042_kbd_firmware_id, strscpy(serio->firmware_id, i8042_kbd_firmware_id,
sizeof(serio->firmware_id)); sizeof(serio->firmware_id));
set_primary_fwnode(&serio->dev, i8042_kbd_fwnode); set_primary_fwnode(&serio->dev, i8042_kbd_fwnode);
@ -1371,15 +1371,15 @@ static int i8042_create_aux_port(int idx)
serio->port_data = port; serio->port_data = port;
serio->dev.parent = &i8042_platform_device->dev; serio->dev.parent = &i8042_platform_device->dev;
if (idx < 0) { if (idx < 0) {
strlcpy(serio->name, "i8042 AUX port", sizeof(serio->name)); strscpy(serio->name, "i8042 AUX port", sizeof(serio->name));
strlcpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys)); strscpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys));
strlcpy(serio->firmware_id, i8042_aux_firmware_id, strscpy(serio->firmware_id, i8042_aux_firmware_id,
sizeof(serio->firmware_id)); sizeof(serio->firmware_id));
serio->close = i8042_port_close; serio->close = i8042_port_close;
} else { } else {
snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx); snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);
snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1); snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);
strlcpy(serio->firmware_id, i8042_aux_firmware_id, strscpy(serio->firmware_id, i8042_aux_firmware_id,
sizeof(serio->firmware_id)); sizeof(serio->firmware_id));
} }

8
drivers/input/serio/olpc_apsp.c
View File

@ -199,8 +199,8 @@ static int olpc_apsp_probe(struct platform_device *pdev)
kb_serio->close = olpc_apsp_close; kb_serio->close = olpc_apsp_close;
kb_serio->port_data = priv; kb_serio->port_data = priv;
kb_serio->dev.parent = &pdev->dev; kb_serio->dev.parent = &pdev->dev;
strlcpy(kb_serio->name, "sp keyboard", sizeof(kb_serio->name)); strscpy(kb_serio->name, "sp keyboard", sizeof(kb_serio->name));
strlcpy(kb_serio->phys, "sp/serio0", sizeof(kb_serio->phys)); strscpy(kb_serio->phys, "sp/serio0", sizeof(kb_serio->phys));
priv->kbio = kb_serio; priv->kbio = kb_serio;
serio_register_port(kb_serio); serio_register_port(kb_serio);
@ -216,8 +216,8 @@ static int olpc_apsp_probe(struct platform_device *pdev)
pad_serio->close = olpc_apsp_close; pad_serio->close = olpc_apsp_close;
pad_serio->port_data = priv; pad_serio->port_data = priv;
pad_serio->dev.parent = &pdev->dev; pad_serio->dev.parent = &pdev->dev;
strlcpy(pad_serio->name, "sp touchpad", sizeof(pad_serio->name)); strscpy(pad_serio->name, "sp touchpad", sizeof(pad_serio->name));
strlcpy(pad_serio->phys, "sp/serio1", sizeof(pad_serio->phys)); strscpy(pad_serio->phys, "sp/serio1", sizeof(pad_serio->phys));
priv->padio = pad_serio; priv->padio = pad_serio;
serio_register_port(pad_serio); serio_register_port(pad_serio);

2
drivers/input/serio/parkbd.c
View File

@ -169,7 +169,7 @@ static struct serio *parkbd_allocate_serio(void)
if (serio) { if (serio) {
serio->id.type = parkbd_mode; serio->id.type = parkbd_mode;
serio->write = parkbd_write; serio->write = parkbd_write;
strlcpy(serio->name, "PARKBD AT/XT keyboard adapter", sizeof(serio->name)); strscpy(serio->name, "PARKBD AT/XT keyboard adapter", sizeof(serio->name));
snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", parkbd_dev->port->name); snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", parkbd_dev->port->name);
} }

4
drivers/input/serio/pcips2.c
View File

@ -149,8 +149,8 @@ static int pcips2_probe(struct pci_dev *dev, const struct pci_device_id *id)
serio->write = pcips2_write; serio->write = pcips2_write;
serio->open = pcips2_open; serio->open = pcips2_open;
serio->close = pcips2_close; serio->close = pcips2_close;
strlcpy(serio->name, pci_name(dev), sizeof(serio->name)); strscpy(serio->name, pci_name(dev), sizeof(serio->name));
strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys));
serio->port_data = ps2if; serio->port_data = ps2if;
serio->dev.parent = &dev->dev; serio->dev.parent = &dev->dev;
ps2if->io = serio; ps2if->io = serio;

4
drivers/input/serio/ps2-gpio.c
View File

@ -449,8 +449,8 @@ static int ps2_gpio_probe(struct platform_device *pdev)
serio->write = drvdata->write_enable ? ps2_gpio_write : NULL; serio->write = drvdata->write_enable ? ps2_gpio_write : NULL;
serio->port_data = drvdata; serio->port_data = drvdata;
serio->dev.parent = dev; serio->dev.parent = dev;
strlcpy(serio->name, dev_name(dev), sizeof(serio->name)); strscpy(serio->name, dev_name(dev), sizeof(serio->name));
strlcpy(serio->phys, dev_name(dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(dev), sizeof(serio->phys));
drvdata->serio = serio; drvdata->serio = serio;
drvdata->dev = dev; drvdata->dev = dev;

2
drivers/input/serio/ps2mult.c
View File

@ -131,7 +131,7 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)
if (!serio) if (!serio)
return -ENOMEM; return -ENOMEM;
strlcpy(serio->name, "TQC PS/2 Multiplexer", sizeof(serio->name)); strscpy(serio->name, "TQC PS/2 Multiplexer", sizeof(serio->name));
snprintf(serio->phys, sizeof(serio->phys), snprintf(serio->phys, sizeof(serio->phys),
"%s/port%d", mx_serio->phys, i); "%s/port%d", mx_serio->phys, i);
serio->id.type = SERIO_8042; serio->id.type = SERIO_8042;

4
drivers/input/serio/q40kbd.c
View File

@ -126,8 +126,8 @@ static int q40kbd_probe(struct platform_device *pdev)
port->close = q40kbd_close; port->close = q40kbd_close;
port->port_data = q40kbd; port->port_data = q40kbd;
port->dev.parent = &pdev->dev; port->dev.parent = &pdev->dev;
strlcpy(port->name, "Q40 Kbd Port", sizeof(port->name)); strscpy(port->name, "Q40 Kbd Port", sizeof(port->name));
strlcpy(port->phys, "Q40", sizeof(port->phys)); strscpy(port->phys, "Q40", sizeof(port->phys));
q40kbd_stop(); q40kbd_stop();

4
drivers/input/serio/rpckbd.c
View File

@ -128,8 +128,8 @@ static int rpckbd_probe(struct platform_device *dev)
serio->close = rpckbd_close; serio->close = rpckbd_close;
serio->dev.parent = &dev->dev; serio->dev.parent = &dev->dev;
serio->port_data = rpckbd; serio->port_data = rpckbd;
strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name)); strscpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys)); strscpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
platform_set_drvdata(dev, serio); platform_set_drvdata(dev, serio);
serio_register_port(serio); serio_register_port(serio);

4
drivers/input/serio/sa1111ps2.c
View File

@ -267,8 +267,8 @@ static int ps2_probe(struct sa1111_dev *dev)
serio->write = ps2_write; serio->write = ps2_write;
serio->open = ps2_open; serio->open = ps2_open;
serio->close = ps2_close; serio->close = ps2_close;
strlcpy(serio->name, dev_name(&dev->dev), sizeof(serio->name)); strscpy(serio->name, dev_name(&dev->dev), sizeof(serio->name));
strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys));
serio->port_data = ps2if; serio->port_data = ps2if;
serio->dev.parent = &dev->dev; serio->dev.parent = &dev->dev;
ps2if->io = serio; ps2if->io = serio;

2
drivers/input/serio/serport.c
View File

@ -171,7 +171,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file,
if (!serio) if (!serio)
return -ENOMEM; return -ENOMEM;
strlcpy(serio->name, "Serial port", sizeof(serio->name)); strscpy(serio->name, "Serial port", sizeof(serio->name));
snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty)); snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty));
serio->id = serport->id; serio->id = serport->id;
serio->id.type = SERIO_RS232; serio->id.type = SERIO_RS232;

4
drivers/input/serio/sun4i-ps2.c
View File

@ -256,8 +256,8 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
serio->close = sun4i_ps2_close; serio->close = sun4i_ps2_close;
serio->port_data = drvdata; serio->port_data = drvdata;
serio->dev.parent = dev; serio->dev.parent = dev;
strlcpy(serio->name, dev_name(dev), sizeof(serio->name)); strscpy(serio->name, dev_name(dev), sizeof(serio->name));
strlcpy(serio->phys, dev_name(dev), sizeof(serio->phys)); strscpy(serio->phys, dev_name(dev), sizeof(serio->phys));
/* shutoff interrupt */ /* shutoff interrupt */
writel(0, drvdata->reg_base + PS2_REG_GCTL); writel(0, drvdata->reg_base + PS2_REG_GCTL);

2
drivers/input/tablet/acecad.c
View File

@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
acecad->input = input_dev; acecad->input = input_dev;
if (dev->manufacturer) if (dev->manufacturer)
strlcpy(acecad->name, dev->manufacturer, sizeof(acecad->name)); strscpy(acecad->name, dev->manufacturer, sizeof(acecad->name));
if (dev->product) { if (dev->product) {
if (dev->manufacturer) if (dev->manufacturer)

2
drivers/input/tablet/hanwang.c
View File

@ -356,7 +356,7 @@ static int hanwang_probe(struct usb_interface *intf, const struct usb_device_id
usb_make_path(dev, hanwang->phys, sizeof(hanwang->phys)); usb_make_path(dev, hanwang->phys, sizeof(hanwang->phys));
strlcat(hanwang->phys, "/input0", sizeof(hanwang->phys)); strlcat(hanwang->phys, "/input0", sizeof(hanwang->phys));
strlcpy(hanwang->name, hanwang->features->name, sizeof(hanwang->name)); strscpy(hanwang->name, hanwang->features->name, sizeof(hanwang->name));
input_dev->name = hanwang->name; input_dev->name = hanwang->name;
input_dev->phys = hanwang->phys; input_dev->phys = hanwang->phys;
usb_to_input_id(dev, &input_dev->id); usb_to_input_id(dev, &input_dev->id);

2
drivers/input/tablet/pegasus_notetaker.c
View File

@ -319,7 +319,7 @@ static int pegasus_probe(struct usb_interface *intf,
pegasus->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; pegasus->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
if (dev->manufacturer) if (dev->manufacturer)
strlcpy(pegasus->name, dev->manufacturer, strscpy(pegasus->name, dev->manufacturer,
sizeof(pegasus->name)); sizeof(pegasus->name));
if (dev->product) { if (dev->product) {

8
drivers/input/touchscreen/atmel_mxt_ts.c
View File

@ -2497,8 +2497,8 @@ static int mxt_vidioc_querycap(struct file *file, void *priv,
{ {
struct mxt_data *data = video_drvdata(file); struct mxt_data *data = video_drvdata(file);
strlcpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver)); strscpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver));
strlcpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card)); strscpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf(cap->bus_info, sizeof(cap->bus_info),
"I2C:%s", dev_name(&data->client->dev)); "I2C:%s", dev_name(&data->client->dev));
return 0; return 0;
@ -2514,11 +2514,11 @@ static int mxt_vidioc_enum_input(struct file *file, void *priv,
switch (i->index) { switch (i->index) {
case MXT_V4L_INPUT_REFS: case MXT_V4L_INPUT_REFS:
strlcpy(i->name, "Mutual Capacitance References", strscpy(i->name, "Mutual Capacitance References",
sizeof(i->name)); sizeof(i->name));
break; break;
case MXT_V4L_INPUT_DELTAS: case MXT_V4L_INPUT_DELTAS:
strlcpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name)); strscpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name));
break; break;
} }

12
drivers/input/touchscreen/edt-ft5x06.c
View File

@ -912,8 +912,8 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
p = strchr(rdbuf, '*'); p = strchr(rdbuf, '*');
if (p) if (p)
*p++ = '\0'; *p++ = '\0';
strlcpy(model_name, rdbuf + 1, EDT_NAME_LEN); strscpy(model_name, rdbuf + 1, EDT_NAME_LEN);
strlcpy(fw_version, p ? p : "", EDT_NAME_LEN); strscpy(fw_version, p ? p : "", EDT_NAME_LEN);
} else if (!strncasecmp(rdbuf, "EP0", 3)) { } else if (!strncasecmp(rdbuf, "EP0", 3)) {
tsdata->version = EDT_M12; tsdata->version = EDT_M12;
@ -926,8 +926,8 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
p = strchr(rdbuf, '*'); p = strchr(rdbuf, '*');
if (p) if (p)
*p++ = '\0'; *p++ = '\0';
strlcpy(model_name, rdbuf, EDT_NAME_LEN); strscpy(model_name, rdbuf, EDT_NAME_LEN);
strlcpy(fw_version, p ? p : "", EDT_NAME_LEN); strscpy(fw_version, p ? p : "", EDT_NAME_LEN);
} else { } else {
/* If it is not an EDT M06/M12 touchscreen, then the model /* If it is not an EDT M06/M12 touchscreen, then the model
* detection is a bit hairy. The different ft5x06 * detection is a bit hairy. The different ft5x06
@ -945,7 +945,7 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
if (error) if (error)
return error; return error;
strlcpy(fw_version, rdbuf, 2); strscpy(fw_version, rdbuf, 2);
error = edt_ft5x06_ts_readwrite(client, 1, "\xA8", error = edt_ft5x06_ts_readwrite(client, 1, "\xA8",
1, rdbuf); 1, rdbuf);
@ -981,7 +981,7 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
1, rdbuf); 1, rdbuf);
if (error) if (error)
return error; return error;
strlcpy(fw_version, rdbuf, 1); strscpy(fw_version, rdbuf, 1);
snprintf(model_name, EDT_NAME_LEN, snprintf(model_name, EDT_NAME_LEN,
"EVERVISION-FT5726NEi"); "EVERVISION-FT5726NEi");
break; break;

6
drivers/input/touchscreen/sur40.c
View File

@ -939,8 +939,8 @@ static int sur40_vidioc_querycap(struct file *file, void *priv,
{ {
struct sur40_state *sur40 = video_drvdata(file); struct sur40_state *sur40 = video_drvdata(file);
strlcpy(cap->driver, DRIVER_SHORT, sizeof(cap->driver)); strscpy(cap->driver, DRIVER_SHORT, sizeof(cap->driver));
strlcpy(cap->card, DRIVER_LONG, sizeof(cap->card)); strscpy(cap->card, DRIVER_LONG, sizeof(cap->card));
usb_make_path(sur40->usbdev, cap->bus_info, sizeof(cap->bus_info)); usb_make_path(sur40->usbdev, cap->bus_info, sizeof(cap->bus_info));
return 0; return 0;
} }
@ -952,7 +952,7 @@ static int sur40_vidioc_enum_input(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
i->type = V4L2_INPUT_TYPE_TOUCH; i->type = V4L2_INPUT_TYPE_TOUCH;
i->std = V4L2_STD_UNKNOWN; i->std = V4L2_STD_UNKNOWN;
strlcpy(i->name, "In-Cell Sensor", sizeof(i->name)); strscpy(i->name, "In-Cell Sensor", sizeof(i->name));
i->capabilities = 0; i->capabilities = 0;
return 0; return 0;
} }

2
drivers/input/touchscreen/usbtouchscreen.c
View File

@ -1708,7 +1708,7 @@ static int usbtouch_probe(struct usb_interface *intf,
usbtouch->input = input_dev; usbtouch->input = input_dev;
if (udev->manufacturer) if (udev->manufacturer)
strlcpy(usbtouch->name, udev->manufacturer, sizeof(usbtouch->name)); strscpy(usbtouch->name, udev->manufacturer, sizeof(usbtouch->name));
if (udev->product) { if (udev->product) {
if (udev->manufacturer) if (udev->manufacturer)

6
drivers/input/touchscreen/wacom_w8001.c
View File

@ -625,7 +625,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
/* For backwards-compatibility we compose the basename based on /* For backwards-compatibility we compose the basename based on
* capabilities and then just append the tool type * capabilities and then just append the tool type
*/ */
strlcpy(basename, "Wacom Serial", sizeof(basename)); strscpy(basename, "Wacom Serial", sizeof(basename));
err_pen = w8001_setup_pen(w8001, basename, sizeof(basename)); err_pen = w8001_setup_pen(w8001, basename, sizeof(basename));
err_touch = w8001_setup_touch(w8001, basename, sizeof(basename)); err_touch = w8001_setup_touch(w8001, basename, sizeof(basename));
@ -635,7 +635,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
} }
if (!err_pen) { if (!err_pen) {
strlcpy(w8001->pen_name, basename, sizeof(w8001->pen_name)); strscpy(w8001->pen_name, basename, sizeof(w8001->pen_name));
strlcat(w8001->pen_name, " Pen", sizeof(w8001->pen_name)); strlcat(w8001->pen_name, " Pen", sizeof(w8001->pen_name));
input_dev_pen->name = w8001->pen_name; input_dev_pen->name = w8001->pen_name;
@ -651,7 +651,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
} }
if (!err_touch) { if (!err_touch) {
strlcpy(w8001->touch_name, basename, sizeof(w8001->touch_name)); strscpy(w8001->touch_name, basename, sizeof(w8001->touch_name));
strlcat(w8001->touch_name, " Finger", strlcat(w8001->touch_name, " Finger",
sizeof(w8001->touch_name)); sizeof(w8001->touch_name));
input_dev_touch->name = w8001->touch_name; input_dev_touch->name = w8001->touch_name;