hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kay Sievers 2009-01-29 22:56:08 -08:00 committed by Dmitry Torokhov
parent e8e0c02340
commit 4e8718a1f9
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,8 @@ static int amba_kmi_probe(struct amba_device *dev, void *id)
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->dev.bus_id, sizeof(io->name)); strlcpy(io->name, dev_name(&dev->dev), sizeof(io->name));
strlcpy(io->phys, dev->dev.bus_id, sizeof(io->phys)); strlcpy(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;

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

@ -359,7 +359,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s", snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s",
(ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse");
strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); strlcpy(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/sa1111ps2.c
View File

@ -246,8 +246,8 @@ static int __devinit 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->dev.bus_id, sizeof(serio->name)); strlcpy(serio->name, dev_name(&dev->dev), sizeof(serio->name));
strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); strlcpy(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/touchscreen/atmel_tsadcc.c
View File

@ -236,7 +236,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
ts_dev->bufferedmeasure = 0; ts_dev->bufferedmeasure = 0;
snprintf(ts_dev->phys, sizeof(ts_dev->phys), snprintf(ts_dev->phys, sizeof(ts_dev->phys),
"%s/input0", pdev->dev.bus_id); "%s/input0", dev_name(&pdev->dev));
input_dev->name = "atmel touch screen controller"; input_dev->name = "atmel touch screen controller";
input_dev->phys = ts_dev->phys; input_dev->phys = ts_dev->phys;

3
drivers/input/touchscreen/tsc2007.c
View File

@ -289,7 +289,8 @@ static int tsc2007_probe(struct i2c_client *client,
pdata->init_platform_hw(); pdata->init_platform_hw();
snprintf(ts->phys, sizeof(ts->phys), "%s/input0", client->dev.bus_id); snprintf(ts->phys, sizeof(ts->phys),
"%s/input0", dev_name(&client->dev));
input_dev->name = "TSC2007 Touchscreen"; input_dev->name = "TSC2007 Touchscreen";
input_dev->phys = ts->phys; input_dev->phys = ts->phys;