Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: change the way we initialize format strings

Changing initialization from

static const char *string = "blah";

to

static const char string[] = "blah";

saves us one pointer per each string.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Dmitry Torokhov and committed by
Greg Kroah-Hartman
bce1a702 2f98382d

+11 -11
+11 -11
drivers/usb/core/devices.c
··· 64 64 /* Define ALLOW_SERIAL_NUMBER if you want to see the serial number of devices */ 65 65 #define ALLOW_SERIAL_NUMBER 66 66 67 - static const char *format_topo = 67 + static const char format_topo[] = 68 68 /* T: Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=dddd MxCh=dd */ 69 69 "\nT: Bus=%2.2d Lev=%2.2d Prnt=%2.2d Port=%2.2d Cnt=%2.2d Dev#=%3d Spd=%-4s MxCh=%2d\n"; 70 70 71 - static const char *format_string_manufacturer = 71 + static const char format_string_manufacturer[] = 72 72 /* S: Manufacturer=xxxx */ 73 73 "S: Manufacturer=%.100s\n"; 74 74 75 - static const char *format_string_product = 75 + static const char format_string_product[] = 76 76 /* S: Product=xxxx */ 77 77 "S: Product=%.100s\n"; 78 78 79 79 #ifdef ALLOW_SERIAL_NUMBER 80 - static const char *format_string_serialnumber = 80 + static const char format_string_serialnumber[] = 81 81 /* S: SerialNumber=xxxx */ 82 82 "S: SerialNumber=%.100s\n"; 83 83 #endif 84 84 85 - static const char *format_bandwidth = 85 + static const char format_bandwidth[] = 86 86 /* B: Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd */ 87 87 "B: Alloc=%3d/%3d us (%2d%%), #Int=%3d, #Iso=%3d\n"; 88 88 89 - static const char *format_device1 = 89 + static const char format_device1[] = 90 90 /* D: Ver=xx.xx Cls=xx(sssss) Sub=xx Prot=xx MxPS=dd #Cfgs=dd */ 91 91 "D: Ver=%2x.%02x Cls=%02x(%-5s) Sub=%02x Prot=%02x MxPS=%2d #Cfgs=%3d\n"; 92 92 93 - static const char *format_device2 = 93 + static const char format_device2[] = 94 94 /* P: Vendor=xxxx ProdID=xxxx Rev=xx.xx */ 95 95 "P: Vendor=%04x ProdID=%04x Rev=%2x.%02x\n"; 96 96 97 - static const char *format_config = 97 + static const char format_config[] = 98 98 /* C: #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA */ 99 99 "C:%c #Ifs=%2d Cfg#=%2d Atr=%02x MxPwr=%3dmA\n"; 100 100 101 - static const char *format_iad = 101 + static const char format_iad[] = 102 102 /* A: FirstIf#=dd IfCount=dd Cls=xx(sssss) Sub=xx Prot=xx */ 103 103 "A: FirstIf#=%2d IfCount=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x\n"; 104 104 105 - static const char *format_iface = 105 + static const char format_iface[] = 106 106 /* I: If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=xxxx*/ 107 107 "I:%c If#=%2d Alt=%2d #EPs=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x Driver=%s\n"; 108 108 109 - static const char *format_endpt = 109 + static const char format_endpt[] = 110 110 /* E: Ad=xx(s) Atr=xx(ssss) MxPS=dddd Ivl=D?s */ 111 111 "E: Ad=%02x(%c) Atr=%02x(%-4s) MxPS=%4d Ivl=%d%cs\n"; 112 112