Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit df388556d7d845983c0da3a4a49873472c466275

Authored by Kay Sievers
Committed by Greg Kroah-Hartman
1 parent 1692713ee9
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

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

Cc: macro@linux-mips.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -86,7 +86,7 @@
86 86 slot);
87 87 goto out_err;
88 88 }
89   - sprintf(tdev->dev.bus_id, "tc%x", slot);
  89 + dev_set_name(&tdev->dev, "tc%x", slot);
90 90 tdev->bus = tbus;
91 91 tdev->dev.parent = &tbus->dev;
92 92 tdev->dev.bus = &tc_bus_type;
... ... @@ -104,7 +104,7 @@
104 104 tdev->vendor[8] = 0;
105 105 tdev->name[8] = 0;
106 106  
107   - pr_info("%s: %s %s %s\n", tdev->dev.bus_id, tdev->vendor,
  107 + pr_info("%s: %s %s %s\n", dev_name(&tdev->dev), tdev->vendor,
108 108 tdev->name, tdev->firmware);
109 109  
110 110 devsize = readb(module + offset + TC_SLOT_SIZE);
... ... @@ -118,7 +118,7 @@
118 118 } else {
119 119 printk(KERN_ERR "%s: Cannot provide slot space "
120 120 "(%dMiB required, up to %dMiB supported)\n",
121   - tdev->dev.bus_id, devsize >> 20,
  121 + dev_name(&tdev->dev), devsize >> 20,
122 122 max(slotsize, extslotsize) >> 20);
123 123 kfree(tdev);
124 124 goto out_err;
... ... @@ -146,7 +146,7 @@
146 146 return 0;
147 147  
148 148 INIT_LIST_HEAD(&tc_bus.devices);
149   - strcpy(tc_bus.dev.bus_id, "tc");
  149 + dev_set_name(&tc_bus.dev, "tc");
150 150 device_register(&tc_bus.dev);
151 151  
152 152 if (tc_bus.info.slot_size) {