From dtor_core@ameritech.net Tue Apr 26 00:45:53 2005 From: Dmitry Torokhov To: linux-kernel@vger.kernel.org Subject: [PATCH 5/5] make driver's name be const char * Date: Tue, 26 Apr 2005 02:34:05 -0500 Driver core: change driver's, bus's, class's and platform device's names to be const char * so one can use const char *drv_name = "asdfg"; when initializing structures. Also kill couple of whitespaces. Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/devices.c | 2 +- include/linux/device.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) --- gregkh-2.6.orig/include/linux/device.h 2005-05-13 11:32:28.000000000 -0700 +++ gregkh-2.6/include/linux/device.h 2005-05-13 11:32:36.000000000 -0700 @@ -47,7 +47,7 @@ struct class_simple; struct bus_type { - char * name; + const char * name; struct subsystem subsys; struct kset drivers; @@ -98,17 +98,17 @@ 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 @@ * device classes */ struct class { - char * name; + const char * name; struct subsystem subsys; struct list_head children; @@ -366,7 +366,7 @@ /* drivers/base/platform.c */ struct platform_device { - char * name; + const char * name; u32 id; struct device dev; u32 num_resources; --- gregkh-2.6.orig/drivers/usb/core/devices.c 2005-05-13 11:32:28.000000000 -0700 +++ gregkh-2.6/drivers/usb/core/devices.c 2005-05-13 11:32:36.000000000 -0700 @@ -239,7 +239,7 @@ int setno) { const struct usb_interface_descriptor *desc = &intfc->altsetting[setno].desc; - char *driver_name = ""; + const char *driver_name = ""; if (start > end) return start;