diff options
| -rw-r--r-- | drivers/base/core.c | 2 | ||||
| -rw-r--r-- | include/linux/device.h | 2 |
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 | */ |
| 1602 | int device_rename(struct device *dev, char *new_name) | 1602 | int 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)); |
| 553 | extern struct device *device_find_child(struct device *dev, void *data, | 553 | extern 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)); |
| 555 | extern int device_rename(struct device *dev, char *new_name); | 555 | extern int device_rename(struct device *dev, const char *new_name); |
| 556 | extern int device_move(struct device *dev, struct device *new_parent, | 556 | extern int device_move(struct device *dev, struct device *new_parent, |
| 557 | enum dpm_order dpm_order); | 557 | enum dpm_order dpm_order); |
| 558 | extern const char *device_get_devnode(struct device *dev, | 558 | extern const char *device_get_devnode(struct device *dev, |
