Commit ae9eba0e2744f1aa15cdc97cd39277a84723ae23
Committed by
David Vrabel
David Vrabel
1 parent
7bc9149422
Exists in
master
and in
20 other branches
uwb: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: David Vrabel <david.vrabel@csr.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: David Vrabel <david.vrabel@csr.com>
Showing 3 changed files with 3 additions and 4 deletions Side-by-side Diff
drivers/uwb/umc-dev.c
| ... | ... | @@ -31,8 +31,7 @@ |
| 31 | 31 | |
| 32 | 32 | umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL); |
| 33 | 33 | if (umc) { |
| 34 | - snprintf(umc->dev.bus_id, sizeof(umc->dev.bus_id), "%s-%d", | |
| 35 | - parent->bus_id, n); | |
| 34 | + dev_set_name(&umc->dev, "%s-%d", dev_name(parent), n); | |
| 36 | 35 | umc->dev.parent = parent; |
| 37 | 36 | umc->dev.bus = &umc_bus_type; |
| 38 | 37 | umc->dev.release = umc_device_release; |
drivers/uwb/whci.c
| ... | ... | @@ -111,7 +111,7 @@ |
| 111 | 111 | + UWBCAPDATA_TO_OFFSET(capdata); |
| 112 | 112 | umc->resource.end = umc->resource.start |
| 113 | 113 | + (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1; |
| 114 | - umc->resource.name = umc->dev.bus_id; | |
| 114 | + umc->resource.name = dev_name(&umc->dev); | |
| 115 | 115 | umc->resource.flags = card->pci->resource[bar].flags; |
| 116 | 116 | umc->resource.parent = &card->pci->resource[bar]; |
| 117 | 117 | umc->irq = card->pci->irq; |
include/linux/uwb/debug.h