Home » Mailing list archives » git-commits-head » 2009 » January » 2

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

Previous thread: wusb: reset WUSB devices with SetAddress(0) by Linux Kernel Mailing List on Friday, January 2, 2009 - 1:02 pm. (1 message)

Next thread: uwb: remove unused #include <version.h> by Linux Kernel Mailing List on Friday, January 2, 2009 - 1:02 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: uwb: struct device - replace bus_id with dev_name(), dev_set_name()
Date: Friday, January 2, 2009 - 1:02 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ae9eba...
Commit:     ae9eba0e2744f1aa15cdc97cd39277a84723ae23
Parent:     7bc914942295b1ea63635b9c1e93b023bd7d3767
Author:     Kay Sievers &lt;kay.sievers@vrfy.org&gt;
AuthorDate: Thu Oct 30 20:06:16 2008 +0100
Committer:  David Vrabel &lt;david.vrabel@csr.com&gt;
CommitDate: Fri Oct 31 15:07:06 2008 +0000

    uwb: struct device - replace bus_id with dev_name(), dev_set_name()
    
    Cc: David Vrabel &lt;david.vrabel@csr.com&gt;
    Acked-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;
    Signed-Off-By: Kay Sievers &lt;kay.sievers@vrfy.org&gt;
    Signed-off-by: David Vrabel &lt;david.vrabel@csr.com&gt;
---
 drivers/uwb/umc-dev.c     |    3 +--
 drivers/uwb/whci.c        |    2 +-
 include/linux/uwb/debug.h |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index aa44e1c..53207e1 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-&gt;dev.bus_id, sizeof(umc-&gt;dev.bus_id), &quot;%s-%d&quot;,
-			 parent-&gt;bus_id, n);
+		dev_set_name(&amp;umc-&gt;dev, &quot;%s-%d&quot;, dev_name(parent), n);
 		umc-&gt;dev.parent  = parent;
 		umc-&gt;dev.bus     = &amp;umc_bus_type;
 		umc-&gt;dev.release = umc_device_release;
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c
index 3df2388..e626467 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-&gt;resource.end    = umc-&gt;resource.start
 		+ (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1;
-	umc-&gt;resource.name   = umc-&gt;dev.bus_id;
+	umc-&gt;resource.name   = dev_name(&amp;umc-&gt;dev);
 	umc-&gt;resource.flags  = card-&gt;pci-&gt;resource[bar].flags;
 	umc-&gt;resource.parent = &amp;card-&gt;pci-&gt;resource[bar];
 	umc-&gt;irq             = ...
[ message continues ]
Previous thread: wusb: reset WUSB devices with SetAddress(0) by Linux Kernel Mailing List on Friday, January 2, 2009 - 1:02 pm. (1 message)

Next thread: uwb: remove unused #include <version.h> by Linux Kernel Mailing List on Friday, January 2, 2009 - 1:02 pm. (1 message)