2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index ef0b35731ff0..83e815d3cd52 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -239,7 +239,7 @@ static char *usb_dump_interface_descriptor(char *start, char *end,
         int setno)
 {
         const struct usb_interface_descriptor *desc = &intfc->altsetting[setno].desc;
-        char *driver_name = "";
+        const char *driver_name = "";
 
         if (start > end)
                 return start;
diff --git a/include/linux/device.h b/include/linux/device.h
index df94c0de53f2..fa9e6ca08f5a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -47,7 +47,7 @@ struct class_device;
 struct class_simple;
 
 struct bus_type {
-        char                    * name;
+        const char              * name;
 
         struct subsystem        subsys;
         struct kset             drivers;
@@ -98,17 +98,17 @@ extern int bus_create_file(struct bus_type *, struct bus_attribute *);
 extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
 
 struct device_driver {
-        char                    * name;
+        const char              * name;
         struct bus_type         * bus;
 
         struct completion       unloaded;
         struct kobject          kobj;
         struct list_head        devices;
 
-        struct module           * owner;
+        struct module           * owner;
 
         int     (*probe)        (struct device * dev);
-        int     (*remove)       (struct device * dev);
+        int     (*remove)       (struct device * dev);
         void    (*shutdown)     (struct device * dev);
         int     (*suspend)      (struct device * dev, pm_message_t state, u32 level);
         int     (*resume)       (struct device * dev, u32 level);
@@ -142,7 +142,7 @@ extern void driver_remove_file(struct device_driver *, struct driver_attribute *
  * device classes
  */
 struct class {
-        char                    * name;
+        const char              * name;
 
         struct subsystem        subsys;
         struct list_head        children;
@@ -366,7 +366,7 @@ extern struct device *device_find(const char *name, struct bus_type *bus);
 /* drivers/base/platform.c */
 
 struct platform_device {
-        char            * name;
+        const char      * name;
         u32             id;
         struct device   dev;
         u32             num_resources;