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>
This commit is contained in:
parent
7bc9149422
commit
ae9eba0e27
|
@ -31,8 +31,7 @@ struct umc_dev *umc_device_create(struct device *parent, int n)
|
|||
|
||||
umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL);
|
||||
if (umc) {
|
||||
snprintf(umc->dev.bus_id, sizeof(umc->dev.bus_id), "%s-%d",
|
||||
parent->bus_id, n);
|
||||
dev_set_name(&umc->dev, "%s-%d", dev_name(parent), n);
|
||||
umc->dev.parent = parent;
|
||||
umc->dev.bus = &umc_bus_type;
|
||||
umc->dev.release = umc_device_release;
|
||||
|
|
|
@ -111,7 +111,7 @@ static int whci_add_cap(struct whci_card *card, int n)
|
|||
+ UWBCAPDATA_TO_OFFSET(capdata);
|
||||
umc->resource.end = umc->resource.start
|
||||
+ (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1;
|
||||
umc->resource.name = umc->dev.bus_id;
|
||||
umc->resource.name = dev_name(&umc->dev);
|
||||
umc->resource.flags = card->pci->resource[bar].flags;
|
||||
umc->resource.parent = &card->pci->resource[bar];
|
||||
umc->irq = card->pci->irq;
|
||||
|
|
|
@ -60,7 +60,7 @@ do { \
|
|||
snprintf(__head, sizeof(__head), \
|
||||
"%s %s: ", \
|
||||
dev_driver_string(__dev), \
|
||||
__dev->bus_id); \
|
||||
dev_name(__dev)); \
|
||||
} \
|
||||
printk(KERN_ERR "%s%s" _tag ": " f, __head, \
|
||||
__func__, ## a); \
|
||||
|
|
Loading…
Reference in a new issue