diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-30 15:06:16 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-10-31 11:07:06 -0400 |
commit | ae9eba0e2744f1aa15cdc97cd39277a84723ae23 (patch) | |
tree | 47cb695aea5f29000ebb4c761b01e5b7fe55c93f /drivers/uwb/whci.c | |
parent | 7bc914942295b1ea63635b9c1e93b023bd7d3767 (diff) |
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>
Diffstat (limited to 'drivers/uwb/whci.c')
-rw-r--r-- | drivers/uwb/whci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c index 3df2388f908f..e626467f95e3 100644 --- a/drivers/uwb/whci.c +++ b/drivers/uwb/whci.c | |||
@@ -111,7 +111,7 @@ static int whci_add_cap(struct whci_card *card, int n) | |||
111 | + UWBCAPDATA_TO_OFFSET(capdata); | 111 | + UWBCAPDATA_TO_OFFSET(capdata); |
112 | umc->resource.end = umc->resource.start | 112 | umc->resource.end = umc->resource.start |
113 | + (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1; | 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 | umc->resource.flags = card->pci->resource[bar].flags; | 115 | umc->resource.flags = card->pci->resource[bar].flags; |
116 | umc->resource.parent = &card->pci->resource[bar]; | 116 | umc->resource.parent = &card->pci->resource[bar]; |
117 | umc->irq = card->pci->irq; | 117 | umc->irq = card->pci->irq; |