summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-30 20:06:16 +0100
committerDavid Vrabel <david.vrabel@csr.com>2008-10-31 15:07:06 +0000
commitae9eba0e2744f1aa15cdc97cd39277a84723ae23 (patch)
tree47cb695aea5f29000ebb4c761b01e5b7fe55c93f
parent7bc914942295b1ea63635b9c1e93b023bd7d3767 (diff)
downloadkernel-crypto-ae9eba0e2744f1aa15cdc97cd39277a84723ae23.tar.gz
kernel-crypto-ae9eba0e2744f1aa15cdc97cd39277a84723ae23.tar.xz
kernel-crypto-ae9eba0e2744f1aa15cdc97cd39277a84723ae23.zip
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>
-rw-r--r--drivers/uwb/umc-dev.c3
-rw-r--r--drivers/uwb/whci.c2
-rw-r--r--include/linux/uwb/debug.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index aa44e1c1a10..53207e14cd8 100644
--- a/drivers/uwb/umc-dev.c
+++ b/drivers/uwb/umc-dev.c
@@ -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;
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c
index 3df2388f908..e626467f95e 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)
+ 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;
diff --git a/include/linux/uwb/debug.h b/include/linux/uwb/debug.h
index a86a73fe303..67a24052714 100644
--- a/include/linux/uwb/debug.h
+++ b/include/linux/uwb/debug.h
@@ -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); \