lkml.org 
[lkml]   [2009]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/61] v4l: struct device - replace bus_id with dev_name(), dev_set_name()
    Date
    From: Kay Sievers <kay.sievers@vrfy.org>

    Cc: mchehab@infradead.org
    Cc: linux-media@vger.kernel.org
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    ---
    drivers/media/radio/radio-tea5764.c | 3 ++-
    drivers/media/video/v4l2-device.c | 2 +-
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
    index 4d35308..3936238 100644
    --- a/drivers/media/radio/radio-tea5764.c
    +++ b/drivers/media/radio/radio-tea5764.c
    @@ -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->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/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
    index cf9d4c7..8a4b74f 100644
    --- 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;
    }
    --
    1.6.2


    \
     
     \ /
      Last update: 2009-03-25 01:41    [W:0.029 / U:0.012 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site