diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-12-04 10:01:52 -0800 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 15:53:41 +1100 |
| commit | b53c7583e26746ef6f66c866841e10450150ed8e (patch) | |
| tree | 3d50aed340e9f2c5f3e8ebc481f4a3737a45eea8 | |
| parent | aab0d375e01d8c16e7e5b9bd915dfaa0a815418f (diff) | |
| download | linux-3.10-b53c7583e26746ef6f66c866841e10450150ed8e.tar.gz linux-3.10-b53c7583e26746ef6f66c866841e10450150ed8e.tar.bz2 linux-3.10-b53c7583e26746ef6f66c866841e10450150ed8e.zip | |
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>
| -rw-r--r-- | drivers/rapidio/rio-scan.c | 8 | ||||
| -rw-r--r-- | include/linux/rio_drv.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index 643a6b98462..5c13f61bfb1 100644 --- 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 90987b7bcc1..32c0547ffaf 100644 --- 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); } /** |