Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 93fde774546c947ac8563da431f0a6d47452551d

Authored by Kay Sievers
Committed by Paul Mundt
1 parent 0d5e19ab07
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

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

drivers/sh/maple/maple.c
Diff comments   View file @ 93fde77
... ... @@ -368,10 +368,8 @@
368 368 /* Do this silently - as not a real device */
369 369 function = 0;
370 370 mdev->driver = &maple_unsupported_device;
371   - sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
372   -
  371 + dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
373 372 } else {
374   -
375 373 matched =
376 374 bus_for_each_drv(&maple_bus_type, NULL, mdev,
377 375 maple_check_matching_driver);
... ... @@ -381,8 +379,9 @@
381 379 dev_info(&mdev->dev, "no driver found\n");
382 380 mdev->driver = &maple_unsupported_device;
383 381 }
384   - sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
385   - mdev->unit, function);
  382 +
  383 + dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
  384 + mdev->unit, function);
386 385 }
387 386  
388 387 mdev->function = function;
... ... @@ -789,7 +788,7 @@
789 788 EXPORT_SYMBOL_GPL(maple_bus_type);
790 789  
791 790 static struct device maple_bus = {
792   - .bus_id = "maple",
  791 + .init_name = "maple",
793 792 .release = maple_bus_release,
794 793 };
795 794  
drivers/sh/superhyway/superhyway.c
Diff comments   View file @ 93fde77
... ... @@ -22,7 +22,7 @@
22 22 static int superhyway_devices;
23 23  
24 24 static struct device superhyway_bus_device = {
25   - .bus_id = "superhyway",
  25 + .init_name = "superhyway",
26 26 };
27 27  
28 28 static void superhyway_device_release(struct device *dev)
... ... @@ -83,7 +83,7 @@
83 83 dev->id.id = dev->vcr.mod_id;
84 84  
85 85 sprintf(dev->name, "SuperHyway device %04x", dev->id.id);
86   - sprintf(dev->dev.bus_id, "%02x", superhyway_devices);
  86 + dev_set_name(&dev->dev, "%02x", superhyway_devices);
87 87  
88 88 superhyway_devices++;
89 89