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 9eefde031597d17e9c41a1f74c66d7b7a707f6eb..8a4b74f3129f7978ba6c6a7e0d1940199d3a8dae 100644 (file)
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -29,12 +29,12 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
        if (dev == NULL || v4l2_dev == NULL)
                return -EINVAL;
        /* Warn if we apparently re-register a device */
-       WARN_ON(dev_get_drvdata(dev));
+       WARN_ON(dev_get_drvdata(dev) != NULL);
        INIT_LIST_HEAD(&v4l2_dev->subdevs);
        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;
 }
@@ -61,7 +61,7 @@ int v4l2_device_register_subdev(struct v4l2_device *dev, struct v4l2_subdev *sd)
        if (dev == NULL || sd == NULL || !sd->name[0])
                return -EINVAL;
        /* Warn if we apparently re-register a subdev */
-       WARN_ON(sd->dev);
+       WARN_ON(sd->dev != NULL);
        if (!try_module_get(sd->owner))
                return -ENODEV;
        sd->dev = dev;