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

PATCH Kay Sievers 1 participant 1 message Jan 25, 2009 Media (V4L/DVB)

Share & tools

Kay Sievers

author

2009-01-25 23:17 UTC #0 lore raw

From: Kay Sievers <[email protected]>
Subject: v4l: 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/media/radio/radio-tea5764.c |    3 ++-
 drivers/media/video/v4l2-device.c   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

drivers/media/radio/radio-tea5764.c +2 -1

@@ -298,7 +298,8 @@ static int vidioc_querycap(struct file *
 
 	strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver));
 	strlcpy(v->card, dev->name, sizeof(v->card));
-	snprintf(v->bus_info, sizeof(v->bus_info), "I2C:%s", dev->dev.bus_id);
+	snprintf(v->bus_info, sizeof(v->bus_info),
+		 "I2C:%s", dev_name(&dev->dev));
 	v->version = RADIO_VERSION;
 	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
 	return 0;

drivers/media/video/v4l2-device.c +1 -1

@@ -34,7 +34,7 @@ int v4l2_device_register(struct device *
 	spin_lock_init(&v4l2_dev->lock);
 	v4l2_dev->dev = dev;
 	snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s",
-			dev->driver->name, dev->bus_id);
+			dev->driver->name, dev_name(dev));
 	dev_set_drvdata(dev, v4l2_dev);
 	return 0;
 }