aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-25 09:17:37 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-24 19:38:23 -0400
commit1fa5ae857bb14f6046205171d98506d8112dd74e (patch)
tree218821345d2c9394bd6184bdb0cd0cb2f1f30d4c /include/linux/device.h
parent6866ac9db02ac1ec71f2aa720a1019581f69a725 (diff)
driver core: get rid of struct device's bus_id string array
Now that all users of bus_id is gone, we can remove it from struct device. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h4
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
428static inline const char *dev_name(const struct device *dev) 427static 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
434extern int dev_set_name(struct device *dev, const char *name, ...) 432extern int dev_set_name(struct device *dev, const char *name, ...)