Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / drivers / message / i2o / device.c

diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 54c2e9a..0ee4264 100644 (file)
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -52,7 +52,6 @@ static inline int i2o_device_issue_claim(struct i2o_device *dev, u32 cmd,
 /**
  *     i2o_device_claim - claim a device for use by an OSM
  *     @dev: I2O device to claim
- *     @drv: I2O driver which wants to claim the device
  *
  *     Do the leg work to assign a device to a given OSM. If the claim succeeds,
  *     the owner is the primary. If the attempt fails a negative errno code
@@ -80,7 +79,6 @@ int i2o_device_claim(struct i2o_device *dev)
 /**
  *     i2o_device_claim_release - release a device that the OSM is using
  *     @dev: device to release
- *     @drv: driver which claimed the device
  *
  *     Drop a claim by an OSM on a given I2O device.
  *
@@ -134,7 +132,7 @@ static void i2o_device_release(struct device *dev)
 {
        struct i2o_device *i2o_dev = to_i2o_device(dev);
 
-       pr_debug("i2o: device %s released\n", dev->bus_id);
+       pr_debug("i2o: device %s released\n", dev_name(dev));
 
        kfree(i2o_dev);
 }
@@ -229,8 +227,8 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
 
        i2o_dev->lct_data = *entry;
 
-       snprintf(i2o_dev->device.bus_id, BUS_ID_SIZE, "%d:%03x", c->unit,
-                i2o_dev->lct_data.tid);
+       dev_set_name(&i2o_dev->device, "%d:%03x", c->unit,
+                    i2o_dev->lct_data.tid);
 
        i2o_dev->iop = c;
        i2o_dev->device.parent = &c->device;
@@ -281,7 +279,7 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
 
        i2o_driver_notify_device_add_all(i2o_dev);
 
-       pr_debug("i2o: device %s added\n", i2o_dev->device.bus_id);
+       pr_debug("i2o: device %s added\n", dev_name(&i2o_dev->device));
 
        return 0;