diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 12 |
1 files changed, 6 insertions, 6 deletions
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; | |||
47 | struct class_simple; | 47 | struct class_simple; |
48 | 48 | ||
49 | struct bus_type { | 49 | struct bus_type { |
50 | char * name; | 50 | const char * name; |
51 | 51 | ||
52 | struct subsystem subsys; | 52 | struct subsystem subsys; |
53 | struct kset drivers; | 53 | struct kset drivers; |
@@ -98,17 +98,17 @@ extern int bus_create_file(struct bus_type *, struct bus_attribute *); | |||
98 | extern void bus_remove_file(struct bus_type *, struct bus_attribute *); | 98 | extern void bus_remove_file(struct bus_type *, struct bus_attribute *); |
99 | 99 | ||
100 | struct device_driver { | 100 | struct device_driver { |
101 | char * name; | 101 | const char * name; |
102 | struct bus_type * bus; | 102 | struct bus_type * bus; |
103 | 103 | ||
104 | struct completion unloaded; | 104 | struct completion unloaded; |
105 | struct kobject kobj; | 105 | struct kobject kobj; |
106 | struct list_head devices; | 106 | struct list_head devices; |
107 | 107 | ||
108 | struct module * owner; | 108 | struct module * owner; |
109 | 109 | ||
110 | int (*probe) (struct device * dev); | 110 | int (*probe) (struct device * dev); |
111 | int (*remove) (struct device * dev); | 111 | int (*remove) (struct device * dev); |
112 | void (*shutdown) (struct device * dev); | 112 | void (*shutdown) (struct device * dev); |
113 | int (*suspend) (struct device * dev, pm_message_t state, u32 level); | 113 | int (*suspend) (struct device * dev, pm_message_t state, u32 level); |
114 | int (*resume) (struct device * dev, u32 level); | 114 | int (*resume) (struct device * dev, u32 level); |
@@ -142,7 +142,7 @@ extern void driver_remove_file(struct device_driver *, struct driver_attribute * | |||
142 | * device classes | 142 | * device classes |
143 | */ | 143 | */ |
144 | struct class { | 144 | struct class { |
145 | char * name; | 145 | const char * name; |
146 | 146 | ||
147 | struct subsystem subsys; | 147 | struct subsystem subsys; |
148 | struct list_head children; | 148 | struct list_head children; |
@@ -366,7 +366,7 @@ extern struct device *device_find(const char *name, struct bus_type *bus); | |||
366 | /* drivers/base/platform.c */ | 366 | /* drivers/base/platform.c */ |
367 | 367 | ||
368 | struct platform_device { | 368 | struct platform_device { |
369 | char * name; | 369 | const char * name; |
370 | u32 id; | 370 | u32 id; |
371 | struct device dev; | 371 | struct device dev; |
372 | u32 num_resources; | 372 | u32 num_resources; |