Commit ae9eba0e authored by Kay Sievers's avatar Kay Sievers Committed by David Vrabel
Browse files

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



Cc: David Vrabel <david.vrabel@csr.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-Off-By: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
parent 7bc91494

drivers/uwb/umc-dev.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/uwb/whci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/uwb/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -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);				\