Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

1 files changed, 6 insertions, 8 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);