Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3ef01ce authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Cc: mchehab@infradead.org
Cc: linux-media@vger.kernel.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 2ead054c

drivers/media/radio/radio-tea5764.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -298,7 +298,8 @@ static int vidioc_querycap(struct file *file, void *priv, 




	strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver));

	strlcpy(v->driver, dev->dev.driver->name, sizeof(v->driver));

	strlcpy(v->card, dev->name, sizeof(v->card));

	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->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	return 0;

	return 0;

drivers/media/video/v4l2-device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) 
	spin_lock_init(&v4l2_dev->lock);

	spin_lock_init(&v4l2_dev->lock);

	v4l2_dev->dev = dev;

	v4l2_dev->dev = dev;

	snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "%s %s",

	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);

	dev_set_drvdata(dev, v4l2_dev);

	return 0;

	return 0;

}

}