7 files changed, 29 insertions, 26 deletions

diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 3fccdd484100..6b9be42c7b98 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -587,8 +587,7 @@ static void create_units(struct fw_device *device)
                 unit->device.bus = &fw_bus_type;
                 unit->device.type = &fw_unit_type;
                 unit->device.parent = &device->device;
-                snprintf(unit->device.bus_id, sizeof(unit->device.bus_id),
-                         "%s.%d", device->device.bus_id, i++);
+                dev_set_name(&unit->device, "%s.%d", dev_name(&device->device), i++);
 
                 init_fw_attribute_group(&unit->device,
                                         fw_unit_attributes,
@@ -711,8 +710,7 @@ static void fw_device_init(struct work_struct *work)
         device->device.type = &fw_device_type;
         device->device.parent = device->card->device;
         device->device.devt = MKDEV(fw_cdev_major, minor);
-        snprintf(device->device.bus_id, sizeof(device->device.bus_id),
-                 "fw%d", minor);
+        dev_set_name(&device->device, "fw%d", minor);
 
         init_fw_attribute_group(&device->device,
                                 fw_device_attributes,
@@ -741,13 +739,13 @@ static void fw_device_init(struct work_struct *work)
                 if (device->config_rom_retries)
                         fw_notify("created device %s: GUID %08x%08x, S%d00, "
                                   "%d config ROM retries\n",
-                                  device->device.bus_id,
+                                  dev_name(&device->device),
                                   device->config_rom[3], device->config_rom[4],
                                   1 << device->max_speed,
                                   device->config_rom_retries);
                 else
                         fw_notify("created device %s: GUID %08x%08x, S%d00\n",
-                                  device->device.bus_id,
+                                  dev_name(&device->device),
                                   device->config_rom[3], device->config_rom[4],
                                   1 << device->max_speed);
                 device->config_rom_retries = 0;
@@ -883,12 +881,12 @@ static void fw_device_refresh(struct work_struct *work)
                     FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
                 goto gone;
 
-        fw_notify("refreshed device %s\n", device->device.bus_id);
+        fw_notify("refreshed device %s\n", dev_name(&device->device));
         device->config_rom_retries = 0;
         goto out;
 
  give_up:
-        fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
+        fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
  gone:
         atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
         fw_device_shutdown(work);
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 8e16bfbdcb3d..46610b090415 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2468,7 +2468,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                 goto fail_self_id;
 
         fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
-                  dev->dev.bus_id, version >> 16, version & 0xff);
+                  dev_name(&dev->dev), version >> 16, version & 0xff);
         return 0;
 
  fail_self_id:
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index d334cac5e1fc..97df6dac3a82 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1135,7 +1135,7 @@ static int sbp2_probe(struct device *dev)
         tgt->unit = unit;
         kref_init(&tgt->kref);
         INIT_LIST_HEAD(&tgt->lu_list);
-        tgt->bus_id = unit->device.bus_id;
+        tgt->bus_id = dev_name(&unit->device);
         tgt->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
 
         if (fw_device_enable_phys_dma(device) < 0)
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 965cfdb84ebc..c19f23267157 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1270,8 +1270,14 @@ static int dv1394_mmap(struct file *file, struct vm_area_struct *vma)
         struct video_card *video = file_to_video_card(file);
         int retval = -EINVAL;
 
-        /* serialize mmap */
-        mutex_lock(&video->mtx);
+        /*
+         * We cannot use the blocking variant mutex_lock here because .mmap
+         * is called with mmap_sem held, while .ioctl, .read, .write acquire
+         * video->mtx and subsequently call copy_to/from_user which will
+         * grab mmap_sem in case of a page fault.
+         */
+        if (!mutex_trylock(&video->mtx))
+                return -EAGAIN;
 
         if ( ! video_card_initialized(video) ) {
                 retval = do_dv1394_init_default(video);
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 8dd09d850419..237d0c9d69c6 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -155,11 +155,11 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
         memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
         h->device.parent = dev;
         set_dev_node(&h->device, dev_to_node(dev));
-        snprintf(h->device.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+        dev_set_name(&h->device, "fw-host%d", h->id);
 
         h->host_dev.parent = &h->device;
         h->host_dev.class = &hpsb_host_class;
-        snprintf(h->host_dev.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+        dev_set_name(&h->host_dev, "fw-host%d", h->id);
 
         if (device_register(&h->device))
                 goto fail;
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 2376b729e876..9e39f73282ee 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -826,13 +826,11 @@ static struct node_entry *nodemgr_create_node(octlet_t guid,
         memcpy(&ne->device, &nodemgr_dev_template_ne,
                sizeof(ne->device));
         ne->device.parent = &host->device;
-        snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx",
-                 (unsigned long long)(ne->guid));
+        dev_set_name(&ne->device, "%016Lx", (unsigned long long)(ne->guid));
 
         ne->node_dev.parent = &ne->device;
         ne->node_dev.class = &nodemgr_ne_class;
-        snprintf(ne->node_dev.bus_id, BUS_ID_SIZE, "%016Lx",
-                (unsigned long long)(ne->guid));
+        dev_set_name(&ne->node_dev, "%016Lx", (unsigned long long)(ne->guid));
 
         if (device_register(&ne->device))
                 goto fail_devreg;
@@ -932,13 +930,11 @@ static void nodemgr_register_device(struct node_entry *ne,
 
         ud->device.parent = parent;
 
-        snprintf(ud->device.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->device, "%s-%u", dev_name(&ne->device), ud->id);
 
         ud->unit_dev.parent = &ud->device;
         ud->unit_dev.class = &nodemgr_ud_class;
-        snprintf(ud->unit_dev.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->unit_dev, "%s-%u", dev_name(&ne->device), ud->id);
 
         if (device_register(&ud->device))
                 goto fail_devreg;
@@ -953,7 +949,7 @@ static void nodemgr_register_device(struct node_entry *ne,
 fail_classdevreg:
         device_unregister(&ud->device);
 fail_devreg:
-        HPSB_ERR("Failed to create unit %s", ud->device.bus_id);
+        HPSB_ERR("Failed to create unit %s", dev_name(&ud->device));
 }       
 
 
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 9f19ac492106..bf7e761c12b1 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2268,7 +2268,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                 return -EFAULT;
         }
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         switch (fi->state) {
         case opened:
@@ -2548,7 +2549,8 @@ static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)
         struct file_info *fi = file->private_data;
         int ret;
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         if (fi->iso_state == RAW1394_ISO_INACTIVE)
                 ret = -EINVAL;
@@ -2669,7 +2671,8 @@ static long raw1394_ioctl(struct file *file, unsigned int cmd,
                 break;
         }
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         switch (fi->iso_state) {
         case RAW1394_ISO_INACTIVE: