UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Cc: inaky.perez-gonzalez@intel.com
Cc: linux-wimax@intel.com
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:
Kay Sievers 2009-03-24 16:38:23 -07:00 committed by Greg Kroah-Hartman
parent b2bf61f23f
commit 2c0f3e96f3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wimax/i2400m/driver.c
View File

@ -613,7 +613,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)
d_fnstart(3, dev, "(i2400m %p)\n", i2400m); d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
snprintf(wimax_dev->name, sizeof(wimax_dev->name), snprintf(wimax_dev->name, sizeof(wimax_dev->name),
"i2400m-%s:%s", dev->bus->name, dev->bus_id); "i2400m-%s:%s", dev->bus->name, dev_name(dev));
i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL); i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL);
if (i2400m->bm_cmd_buf == NULL) { if (i2400m->bm_cmd_buf == NULL) {

2
drivers/net/wimax/i2400m/usb-notif.c
View File

@ -102,7 +102,7 @@ int i2400mu_notification_grok(struct i2400mu *i2400mu, const void *buf,
dev_err(dev, "HW BUG? Unknown/unexpected data in notification " dev_err(dev, "HW BUG? Unknown/unexpected data in notification "
"message (%zu bytes)\n", buf_len); "message (%zu bytes)\n", buf_len);
snprintf(prefix, sizeof(prefix), "%s %s: ", snprintf(prefix, sizeof(prefix), "%s %s: ",
dev_driver_string(dev) , dev->bus_id); dev_driver_string(dev) , dev_name(dev));
if (buf_len > 64) { if (buf_len > 64) {
print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,
8, 4, buf, 64, 0); 8, 4, buf, 64, 0);

2
include/linux/wimax/debug.h
View File

@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size,
WARN_ON(1); WARN_ON(1);
} else } else
snprintf(head, head_size, "%s %s: ", snprintf(head, head_size, "%s %s: ",
dev_driver_string(dev), dev->bus_id); dev_driver_string(dev), dev_name(dev));
} }