forked from luck/tmp_suning_uos_patched
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:
parent
b2bf61f23f
commit
2c0f3e96f3
|
@ -613,7 +613,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)
|
|||
d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
|
||||
|
||||
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);
|
||||
if (i2400m->bm_cmd_buf == NULL) {
|
||||
|
|
|
@ -102,7 +102,7 @@ int i2400mu_notification_grok(struct i2400mu *i2400mu, const void *buf,
|
|||
dev_err(dev, "HW BUG? Unknown/unexpected data in notification "
|
||||
"message (%zu bytes)\n", buf_len);
|
||||
snprintf(prefix, sizeof(prefix), "%s %s: ",
|
||||
dev_driver_string(dev) , dev->bus_id);
|
||||
dev_driver_string(dev) , dev_name(dev));
|
||||
if (buf_len > 64) {
|
||||
print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,
|
||||
8, 4, buf, 64, 0);
|
||||
|
|
|
@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size,
|
|||
WARN_ON(1);
|
||||
} else
|
||||
snprintf(head, head_size, "%s %s: ",
|
||||
dev_driver_string(dev), dev->bus_id);
|
||||
dev_driver_string(dev), dev_name(dev));
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user