diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-25 23:00:16 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-25 23:00:16 +0000 |
| commit | 32ff0a94de197313d0c1838ab4ad3a051064b292 (patch) | |
| tree | 086d35ec20ecbc111fc61dddacd39a3aafb450a2 | |
| parent | e2dece7b3a29cf172128e7a3481940322ca5df20 (diff) | |
| download | mediapointer-dvb-s2-32ff0a94de197313d0c1838ab4ad3a051064b292.tar.gz mediapointer-dvb-s2-32ff0a94de197313d0c1838ab4ad3a051064b292.tar.bz2 | |
struct device - replace bus_id with dev_name(), dev_set_name()
From: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/radio/radio-tea5764.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/radio/radio-tea5764.c b/linux/drivers/media/radio/radio-tea5764.c index 328fa50ca..9194a70aa 100644 --- a/linux/drivers/media/radio/radio-tea5764.c +++ b/linux/drivers/media/radio/radio-tea5764.c @@ -302,7 +302,8 @@ static int vidioc_querycap(struct file *file, void *priv, 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; diff --git a/linux/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index cf9d4c7f5..8a4b74f31 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/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; } |