diff options
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/usb-notif.c | 2 | ||||
-rw-r--r-- | include/linux/wimax/debug.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index e80a0b65a754..d58b971faa64 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -613,7 +613,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags) | |||
613 | d_fnstart(3, dev, "(i2400m %p)\n", i2400m); | 613 | d_fnstart(3, dev, "(i2400m %p)\n", i2400m); |
614 | 614 | ||
615 | snprintf(wimax_dev->name, sizeof(wimax_dev->name), | 615 | snprintf(wimax_dev->name, sizeof(wimax_dev->name), |
616 | "i2400m-%s:%s", dev->bus->name, dev->bus_id); | 616 | "i2400m-%s:%s", dev->bus->name, dev_name(dev)); |
617 | 617 | ||
618 | i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL); | 618 | i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL); |
619 | if (i2400m->bm_cmd_buf == NULL) { | 619 | if (i2400m->bm_cmd_buf == NULL) { |
diff --git a/drivers/net/wimax/i2400m/usb-notif.c b/drivers/net/wimax/i2400m/usb-notif.c index 9702c22b2497..0528879f6d39 100644 --- a/drivers/net/wimax/i2400m/usb-notif.c +++ b/drivers/net/wimax/i2400m/usb-notif.c | |||
@@ -102,7 +102,7 @@ int i2400mu_notification_grok(struct i2400mu *i2400mu, const void *buf, | |||
102 | dev_err(dev, "HW BUG? Unknown/unexpected data in notification " | 102 | dev_err(dev, "HW BUG? Unknown/unexpected data in notification " |
103 | "message (%zu bytes)\n", buf_len); | 103 | "message (%zu bytes)\n", buf_len); |
104 | snprintf(prefix, sizeof(prefix), "%s %s: ", | 104 | snprintf(prefix, sizeof(prefix), "%s %s: ", |
105 | dev_driver_string(dev) , dev->bus_id); | 105 | dev_driver_string(dev) , dev_name(dev)); |
106 | if (buf_len > 64) { | 106 | if (buf_len > 64) { |
107 | print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, | 107 | print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, |
108 | 8, 4, buf, 64, 0); | 108 | 8, 4, buf, 64, 0); |
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h index ba0c49399a83..c703e0340423 100644 --- a/include/linux/wimax/debug.h +++ b/include/linux/wimax/debug.h | |||
@@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size, | |||
178 | WARN_ON(1); | 178 | WARN_ON(1); |
179 | } else | 179 | } else |
180 | snprintf(head, head_size, "%s %s: ", | 180 | snprintf(head, head_size, "%s %s: ", |
181 | dev_driver_string(dev), dev->bus_id); | 181 | dev_driver_string(dev), dev_name(dev)); |
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||