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

PATCH Applied Kay Sievers 2 participants 2 messages Jan 25, 2009 – Jan 30, 2009

Subsystems (5)

HID Input drivers Arm/Microchip (AT91) SoC support PA-RISC architecture +1 more subsystems

lore

Share & tools

lore

Kay Sievers

author

2009-01-25 22:48 UTC #0 lore raw

From: Kay Sievers <[email protected]>
Subject: input: struct device - replace bus_id with dev_name(), dev_set_name()

Cc [email protected]

Acked-by Greg Kroah-Hartman <[email protected]>

Signed-off-by Kay Sievers <[email protected]>

---
 drivers/input/serio/ambakmi.c            |    4 ++--
 drivers/input/serio/gscps2.c             |    2 +-
 drivers/input/serio/sa1111ps2.c          |    4 ++--
 drivers/input/touchscreen/atmel_tsadcc.c |    2 +-
 drivers/input/touchscreen/tsc2007.c      |    3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

drivers/input/serio/ambakmi.c +2 -2

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

drivers/input/serio/gscps2.c +1 -1

@@ -359,7 +359,7 @@ static int __init gscps2_probe(struct pa
 
 	snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s",
 		 (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->write		= gscps2_write;
 	serio->open		= gscps2_open;

drivers/input/serio/sa1111ps2.c +2 -2

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

drivers/input/touchscreen/atmel_tsadcc.c +1 -1

@@ -236,7 +236,7 @@ static int __devinit atmel_tsadcc_probe(
 	ts_dev->bufferedmeasure = 0;
 
 	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->phys = ts_dev->phys;

drivers/input/touchscreen/tsc2007.c +2 -1

@@ -289,7 +289,8 @@ static int tsc2007_probe(struct i2c_clie
 
 	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->phys = ts->phys;

Dmitry Torokhov

maintainer Applied

2009-01-30 07:10 UTC #1 lore raw

Quoted 3 lines · Kay Sievers

From: Kay Sievers <[email protected]>
Subject: input: struct device - replace bus_id with dev_name(), dev_set_name()

Applied to 'for-linus', thank you Kay.

Signature · 1 line

Dmitry