Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b53c7583e26746ef6f66c866841e10450150ed8e

Authored by Kay Sievers
Committed by Paul Mackerras
1 parent aab0d375e0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/rapidio/rio-scan.c
Diff comments   View file @ b53c758
... ... @@ -365,15 +365,15 @@
365 365 rdid++)
366 366 rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
367 367 rdev->rswitch = rswitch;
368   - sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id,
369   - rdev->rswitch->switchid);
  368 + dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
  369 + rdev->rswitch->switchid);
370 370 rio_route_set_ops(rdev);
371 371  
372 372 list_add_tail(&rswitch->node, &rio_switches);
373 373  
374 374 } else
375   - sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id,
376   - rdev->destid);
  375 + dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
  376 + rdev->destid);
377 377  
378 378 rdev->dev.bus = &rio_bus_type;
379 379  
include/linux/rio_drv.h
Diff comments   View file @ b53c758
... ... @@ -427,9 +427,9 @@
427 427 * Get the unique RIO device identifier. Returns the device
428 428 * identifier string.
429 429 */
430   -static inline char *rio_name(struct rio_dev *rdev)
  430 +static inline const char *rio_name(struct rio_dev *rdev)
431 431 {
432   - return rdev->dev.bus_id;
  432 + return dev_name(&rdev->dev);
433 433 }
434 434  
435 435 /**