diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 47f343c7bdda..d5706c448bcb 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -374,7 +374,6 @@ struct device { | |||
374 | struct device *parent; | 374 | struct device *parent; |
375 | 375 | ||
376 | struct kobject kobj; | 376 | struct kobject kobj; |
377 | char bus_id[BUS_ID_SIZE]; /* position on parent bus */ | ||
378 | unsigned uevent_suppress:1; | 377 | unsigned uevent_suppress:1; |
379 | const char *init_name; /* initial name of the device */ | 378 | const char *init_name; /* initial name of the device */ |
380 | struct device_type *type; | 379 | struct device_type *type; |
@@ -427,8 +426,7 @@ struct device { | |||
427 | 426 | ||
428 | static inline const char *dev_name(const struct device *dev) | 427 | static inline const char *dev_name(const struct device *dev) |
429 | { | 428 | { |
430 | /* will be changed into kobject_name(&dev->kobj) in the near future */ | 429 | return kobject_name(&dev->kobj); |
431 | return dev->bus_id; | ||
432 | } | 430 | } |
433 | 431 | ||
434 | extern int dev_set_name(struct device *dev, const char *name, ...) | 432 | extern int dev_set_name(struct device *dev, const char *name, ...) |