Commit 916941b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* 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
parents fbf4d7ff 413c239f

drivers/base/core.c

+15 −0
Original line number Diff line number Diff line
@@ -759,6 +759,21 @@ static void device_remove_class_symlinks(struct device *dev) 
	sysfs_remove_link(&dev->kobj, "subsystem");

}



/**

 * 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.

include/linux/device.h

+3 −0
Original line number Diff line number Diff line
@@ -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)

{