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

Input: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Kay Sievers and committed by
Dmitry Torokhov 4e8718a1 e8e0c023

+8 -7
+2 -2
drivers/input/serio/ambakmi.c
··· 129 129 io->write = amba_kmi_write; 130 130 io->open = amba_kmi_open; 131 131 io->close = amba_kmi_close; 132 - strlcpy(io->name, dev->dev.bus_id, sizeof(io->name)); 133 - strlcpy(io->phys, dev->dev.bus_id, sizeof(io->phys)); 132 + strlcpy(io->name, dev_name(&dev->dev), sizeof(io->name)); 133 + strlcpy(io->phys, dev_name(&dev->dev), sizeof(io->phys)); 134 134 io->port_data = kmi; 135 135 io->dev.parent = &dev->dev; 136 136
+1 -1
drivers/input/serio/gscps2.c
··· 359 359 360 360 snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s", 361 361 (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); 362 - strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); 362 + strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 363 363 serio->id.type = SERIO_8042; 364 364 serio->write = gscps2_write; 365 365 serio->open = gscps2_open;
+2 -2
drivers/input/serio/sa1111ps2.c
··· 246 246 serio->write = ps2_write; 247 247 serio->open = ps2_open; 248 248 serio->close = ps2_close; 249 - strlcpy(serio->name, dev->dev.bus_id, sizeof(serio->name)); 250 - strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); 249 + strlcpy(serio->name, dev_name(&dev->dev), sizeof(serio->name)); 250 + strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 251 251 serio->port_data = ps2if; 252 252 serio->dev.parent = &dev->dev; 253 253 ps2if->io = serio;
+1 -1
drivers/input/touchscreen/atmel_tsadcc.c
··· 236 236 ts_dev->bufferedmeasure = 0; 237 237 238 238 snprintf(ts_dev->phys, sizeof(ts_dev->phys), 239 - "%s/input0", pdev->dev.bus_id); 239 + "%s/input0", dev_name(&pdev->dev)); 240 240 241 241 input_dev->name = "atmel touch screen controller"; 242 242 input_dev->phys = ts_dev->phys;
+2 -1
drivers/input/touchscreen/tsc2007.c
··· 289 289 290 290 pdata->init_platform_hw(); 291 291 292 - snprintf(ts->phys, sizeof(ts->phys), "%s/input0", client->dev.bus_id); 292 + snprintf(ts->phys, sizeof(ts->phys), 293 + "%s/input0", dev_name(&client->dev)); 293 294 294 295 input_dev->name = "TSC2007 Touchscreen"; 295 296 input_dev->phys = ts->phys;