lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kay Sievers
2008-12-04 10:01:52 -08:00
committed by Paul Mackerras
parent aab0d375e0
commit b53c7583e2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/rapidio/rio-scan.c
View File

@@ -365,14 +365,14 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
rdid++) rdid++)
rswitch->route_table[rdid] = RIO_INVALID_ROUTE; rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
rdev->rswitch = rswitch; rdev->rswitch = rswitch;
sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id, dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
rdev->rswitch->switchid); rdev->rswitch->switchid);
rio_route_set_ops(rdev); rio_route_set_ops(rdev);
list_add_tail(&rswitch->node, &rio_switches); list_add_tail(&rswitch->node, &rio_switches);
} else } else
sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id, dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
rdev->destid); rdev->destid);
rdev->dev.bus = &rio_bus_type; rdev->dev.bus = &rio_bus_type;

4
include/linux/rio_drv.h
View File

@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *);
* Get the unique RIO device identifier. Returns the device * Get the unique RIO device identifier. Returns the device
* identifier string. * 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);
} }
/** /**