diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 8c23e3dfe3ac..6a2d04c011bc 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -183,7 +183,6 @@ struct class { | |||
183 | struct module *owner; | 183 | struct module *owner; |
184 | 184 | ||
185 | struct kset subsys; | 185 | struct kset subsys; |
186 | struct list_head children; | ||
187 | struct list_head devices; | 186 | struct list_head devices; |
188 | struct list_head interfaces; | 187 | struct list_head interfaces; |
189 | struct kset class_dirs; | 188 | struct kset class_dirs; |
@@ -386,6 +385,9 @@ static inline const char *dev_name(struct device *dev) | |||
386 | return dev->bus_id; | 385 | return dev->bus_id; |
387 | } | 386 | } |
388 | 387 | ||
388 | extern int dev_set_name(struct device *dev, const char *name, ...) | ||
389 | __attribute__((format(printf, 2, 3))); | ||
390 | |||
389 | #ifdef CONFIG_NUMA | 391 | #ifdef CONFIG_NUMA |
390 | static inline int dev_to_node(struct device *dev) | 392 | static inline int dev_to_node(struct device *dev) |
391 | { | 393 | { |
@@ -450,9 +452,21 @@ extern int __must_check device_reprobe(struct device *dev); | |||
450 | /* | 452 | /* |
451 | * Easy functions for dynamically creating devices on the fly | 453 | * Easy functions for dynamically creating devices on the fly |
452 | */ | 454 | */ |
455 | extern struct device *device_create_vargs(struct class *cls, | ||
456 | struct device *parent, | ||
457 | dev_t devt, | ||
458 | void *drvdata, | ||
459 | const char *fmt, | ||
460 | va_list vargs); | ||
453 | extern struct device *device_create(struct class *cls, struct device *parent, | 461 | extern struct device *device_create(struct class *cls, struct device *parent, |
454 | dev_t devt, const char *fmt, ...) | 462 | dev_t devt, const char *fmt, ...) |
455 | __attribute__((format(printf, 4, 5))); | 463 | __attribute__((format(printf, 4, 5))); |
464 | extern struct device *device_create_drvdata(struct class *cls, | ||
465 | struct device *parent, | ||
466 | dev_t devt, | ||
467 | void *drvdata, | ||
468 | const char *fmt, ...) | ||
469 | __attribute__((format(printf, 5, 6))); | ||
456 | extern void device_destroy(struct class *cls, dev_t devt); | 470 | extern void device_destroy(struct class *cls, dev_t devt); |
457 | 471 | ||
458 | /* | 472 | /* |