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

[linux-2.6-omap-h63xx.git] / drivers / media / video / v4l2-device.c

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index cf9d4c7f571a369741456a26576a5714975a1119..8a4b74f3129f7978ba6c6a7e0d1940199d3a8dae 100644 (file)
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -34,7 +34,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
        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;
 }