aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-08-05 11:38:18 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 16:53:35 -0400
commit6937e8f8c0135f2325194c372ada6dc655499992 (patch)
tree436ede36f95f1cb40d5b9bd8f6711ca26faf0045
parent6fd69dc578fa0b1bbc3aad70ae3af9a137211707 (diff)
driver core: device_rename's new_name can be const
The new_name argument to device_rename() can be const as kobject_rename's new_name argument is. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/core.c2
-rw-r--r--include/linux/device.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index f8e72724dd4b..d1b2c9adc271 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1599,7 +1599,7 @@ EXPORT_SYMBOL_GPL(device_destroy);
1599 * on the same device to ensure that new_name is valid and 1599 * on the same device to ensure that new_name is valid and
1600 * won't conflict with other devices. 1600 * won't conflict with other devices.
1601 */ 1601 */
1602int device_rename(struct device *dev, char *new_name) 1602int device_rename(struct device *dev, const char *new_name)
1603{ 1603{
1604 char *old_class_name = NULL; 1604 char *old_class_name = NULL;
1605 char *new_class_name = NULL; 1605 char *new_class_name = NULL;
diff --git a/include/linux/device.h b/include/linux/device.h
index 0ca24e93304f..516fecacf27b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -552,7 +552,7 @@ extern int device_for_each_child(struct device *dev, void *data,
552 int (*fn)(struct device *dev, void *data)); 552 int (*fn)(struct device *dev, void *data));
553extern struct device *device_find_child(struct device *dev, void *data, 553extern struct device *device_find_child(struct device *dev, void *data,
554 int (*match)(struct device *dev, void *data)); 554 int (*match)(struct device *dev, void *data));
555extern int device_rename(struct device *dev, char *new_name); 555extern int device_rename(struct device *dev, const char *new_name);
556extern int device_move(struct device *dev, struct device *new_parent, 556extern int device_move(struct device *dev, struct device *new_parent,
557 enum dpm_order dpm_order); 557 enum dpm_order dpm_order);
558extern const char *device_get_devnode(struct device *dev, 558extern const char *device_get_devnode(struct device *dev,