1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c
index dce6dae5740e..74c325e594a2 100644
--- a/drivers/media/video/bt8xx/bttv-gpio.c
+++ b/drivers/media/video/bt8xx/bttv-gpio.c
@@ -42,7 +42,7 @@ static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv)
         struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
         int len = strlen(sub->wanted);
 
-        if (0 == strncmp(dev->bus_id, sub->wanted, len))
+        if (0 == strncmp(dev_name(dev), sub->wanted, len))
                 return 1;
         return 0;
 }
@@ -91,15 +91,14 @@ int bttv_sub_add_device(struct bttv_core *core, char *name)
         sub->dev.parent  = &core->pci->dev;
         sub->dev.bus     = &bttv_sub_bus_type;
         sub->dev.release = release_sub_device;
-        snprintf(sub->dev.bus_id,sizeof(sub->dev.bus_id),"%s%d",
-                 name, core->nr);
+        dev_set_name(&sub->dev, "%s%d", name, core->nr);
 
         err = device_register(&sub->dev);
         if (0 != err) {
                 kfree(sub);
                 return err;
         }
-        printk("bttv%d: add subdevice \"%s\"\n", core->nr, sub->dev.bus_id);
+        printk("bttv%d: add subdevice \"%s\"\n", core->nr, dev_name(&sub->dev));
         list_add_tail(&sub->list,&core->subs);
         return 0;
 }