Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9591463af7ea3a2d723c7e39c08aa05ad27e7bfc

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

dio: 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>

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

... ... @@ -182,7 +182,7 @@
182 182  
183 183 /* Initialize the DIO bus */
184 184 INIT_LIST_HEAD(&dio_bus.devices);
185   - strcpy(dio_bus.dev.bus_id, "dio");
  185 + dev_set_name(&dio_bus.dev, "dio");
186 186 error = device_register(&dio_bus.dev);
187 187 if (error) {
188 188 pr_err("DIO: Error registering dio_bus\n");
... ... @@ -237,7 +237,7 @@
237 237 dev->scode = scode;
238 238 dev->resource.start = pa;
239 239 dev->resource.end = pa + DIO_SIZE(scode, va);
240   - sprintf(dev->dev.bus_id,"%02x", scode);
  240 + dev_set_name(&dev->dev, "%02x", scode);
241 241  
242 242 /* read the ID byte(s) and encode if necessary. */
243 243 prid = DIO_ID(va);