diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-12-04 13:01:52 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 23:53:41 -0500 |
commit | b53c7583e26746ef6f66c866841e10450150ed8e (patch) | |
tree | 3d50aed340e9f2c5f3e8ebc481f4a3737a45eea8 /drivers/rapidio | |
parent | aab0d375e01d8c16e7e5b9bd915dfaa0a815418f (diff) |
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>
Diffstat (limited to 'drivers/rapidio')
-rw-r--r-- | drivers/rapidio/rio-scan.c | 8 |
1 files changed, 4 insertions, 4 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, | |||
365 | rdid++) | 365 | rdid++) |
366 | rswitch->route_table[rdid] = RIO_INVALID_ROUTE; | 366 | rswitch->route_table[rdid] = RIO_INVALID_ROUTE; |
367 | rdev->rswitch = rswitch; | 367 | rdev->rswitch = rswitch; |
368 | sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id, | 368 | dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id, |
369 | rdev->rswitch->switchid); | 369 | rdev->rswitch->switchid); |
370 | rio_route_set_ops(rdev); | 370 | rio_route_set_ops(rdev); |
371 | 371 | ||
372 | list_add_tail(&rswitch->node, &rio_switches); | 372 | list_add_tail(&rswitch->node, &rio_switches); |
373 | 373 | ||
374 | } else | 374 | } else |
375 | sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id, | 375 | dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id, |
376 | rdev->destid); | 376 | rdev->destid); |
377 | 377 | ||
378 | rdev->dev.bus = &rio_bus_type; | 378 | rdev->dev.bus = &rio_bus_type; |
379 | 379 | ||