diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-29 21:29:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-29 21:29:39 -0700 |
| commit | 916941b2bfd9c4a8b66855f198ae16c3f51ef570 (patch) | |
| tree | 471867d3d460f10d1620efe3c85763c4d95fa14d | |
| parent | fbf4d7ffda0398e8b20aa8b34ca751bf946699ef (diff) | |
| parent | 413c239fad68258157f903b3ffd9bfcc53f5e34b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6tip-timers-nohz-2008-05-30_12.28_Fri
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
driver-core: prepare for 2.6.27 api change by adding dev_set_name
| -rw-r--r-- | drivers/base/core.c | 15 | ||||
| -rw-r--r-- | include/linux/device.h | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 72eccae4904b..422cfcad486d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -760,6 +760,21 @@ static void device_remove_class_symlinks(struct device *dev) } /** + * dev_set_name - set a device name + * @dev: device + */ +int dev_set_name(struct device *dev, const char *fmt, ...) +{ + va_list vargs; + + va_start(vargs, fmt); + vsnprintf(dev->bus_id, sizeof(dev->bus_id), fmt, vargs); + va_end(vargs); + return 0; +} +EXPORT_SYMBOL_GPL(dev_set_name); + +/** * device_add - add device to device hierarchy. * @dev: device. * diff --git a/include/linux/device.h b/include/linux/device.h index 14616e80213c..6a2d04c011bc 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -385,6 +385,9 @@ static inline const char *dev_name(struct device *dev) return dev->bus_id; } +extern int dev_set_name(struct device *dev, const char *name, ...) + __attribute__((format(printf, 2, 3))); + #ifdef CONFIG_NUMA static inline int dev_to_node(struct device *dev) { |