rapidio: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 643a6b98462b67062487fec8e37e505fe9c50cd1..5c13f61bfb1b5003f67ea3142275444f776242e4 100644 (file)
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -365,15 +365,15 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                                rdid++)
                        rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
                rdev->rswitch = rswitch;
-               sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id,
-                       rdev->rswitch->switchid);
+               dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
+                            rdev->rswitch->switchid);
                rio_route_set_ops(rdev);
 
                list_add_tail(&rswitch->node, &rio_switches);
 
        } else
-               sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id,
-                       rdev->destid);
+               dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
+                            rdev->destid);
 
        rdev->dev.bus = &rio_bus_type;
 

diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 90987b7bcc1be21efcd979f9029dbecb89daf503..32c0547ffafc2906d4ce461a9cf0e3ca0c0e2c52 100644 (file)
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *);
  * Get the unique RIO device identifier. Returns the device
  * identifier string.
  */
-static inline char *rio_name(struct rio_dev *rdev)
+static inline const char *rio_name(struct rio_dev *rdev)
 {
-       return rdev->dev.bus_id;
+       return dev_name(&rdev->dev);
 }
 
 /**