adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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:
Kay Sievers 2008-10-30 20:06:16 +01:00 committed by David Vrabel
parent 7bc9149422
commit ae9eba0e27
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/uwb/umc-dev.c
View file

@ -31,8 +31,7 @@ struct umc_dev *umc_device_create(struct device *parent, int n)
umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL); umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL);
if (umc) { if (umc) {
snprintf(umc->dev.bus_id, sizeof(umc->dev.bus_id), "%s-%d", dev_set_name(&umc->dev, "%s-%d", dev_name(parent), n);
parent->bus_id, n);
umc->dev.parent = parent; umc->dev.parent = parent;
umc->dev.bus = &umc_bus_type; umc->dev.bus = &umc_bus_type;
umc->dev.release = umc_device_release; umc->dev.release = umc_device_release;

2
drivers/uwb/whci.c
View file

@ -111,7 +111,7 @@ static int whci_add_cap(struct whci_card *card, int n)
+ UWBCAPDATA_TO_OFFSET(capdata); + UWBCAPDATA_TO_OFFSET(capdata);
umc->resource.end = umc->resource.start umc->resource.end = umc->resource.start
+ (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1; + (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.flags = card->pci->resource[bar].flags;
umc->resource.parent = &card->pci->resource[bar]; umc->resource.parent = &card->pci->resource[bar];
umc->irq = card->pci->irq; umc->irq = card->pci->irq;

2
include/linux/uwb/debug.h
View file

@ -60,7 +60,7 @@ do { \
snprintf(__head, sizeof(__head), \ snprintf(__head, sizeof(__head), \
"%s %s: ", \ "%s %s: ", \
dev_driver_string(__dev), \ dev_driver_string(__dev), \
__dev->bus_id); \ dev_name(__dev)); \
} \ } \
printk(KERN_ERR "%s%s" _tag ": " f, __head, \ printk(KERN_ERR "%s%s" _tag ": " f, __head, \
__func__, ## a); \ __func__, ## a); \