Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bce1a702 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

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: default avatarDmitry Torokhov <dtor@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f98382d

drivers/usb/core/devices.c

+11 −11
Original line number Diff line number Diff line
@@ -64,49 +64,49 @@ 
/* Define ALLOW_SERIAL_NUMBER if you want to see the serial number of devices */

#define ALLOW_SERIAL_NUMBER



static const char *format_topo =

static const char format_topo[] =

/* T:  Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=dddd MxCh=dd */

"\nT:  Bus=%2.2d Lev=%2.2d Prnt=%2.2d Port=%2.2d Cnt=%2.2d Dev#=%3d Spd=%-4s MxCh=%2d\n";



static const char *format_string_manufacturer =

static const char format_string_manufacturer[] =

/* S:  Manufacturer=xxxx */

  "S:  Manufacturer=%.100s\n";



static const char *format_string_product =

static const char format_string_product[] =

/* S:  Product=xxxx */

  "S:  Product=%.100s\n";



#ifdef ALLOW_SERIAL_NUMBER

static const char *format_string_serialnumber =

static const char format_string_serialnumber[] =

/* S:  SerialNumber=xxxx */

  "S:  SerialNumber=%.100s\n";

#endif



static const char *format_bandwidth =

static const char format_bandwidth[] =

/* B:  Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd */

  "B:  Alloc=%3d/%3d us (%2d%%), #Int=%3d, #Iso=%3d\n";



static const char *format_device1 =

static const char format_device1[] =

/* D:  Ver=xx.xx Cls=xx(sssss) Sub=xx Prot=xx MxPS=dd #Cfgs=dd */

  "D:  Ver=%2x.%02x Cls=%02x(%-5s) Sub=%02x Prot=%02x MxPS=%2d #Cfgs=%3d\n";



static const char *format_device2 =

static const char format_device2[] =

/* P:  Vendor=xxxx ProdID=xxxx Rev=xx.xx */

  "P:  Vendor=%04x ProdID=%04x Rev=%2x.%02x\n";



static const char *format_config =

static const char format_config[] =

/* C:  #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA */

  "C:%c #Ifs=%2d Cfg#=%2d Atr=%02x MxPwr=%3dmA\n";



static const char *format_iad =

static const char format_iad[] =

/* A:  FirstIf#=dd IfCount=dd Cls=xx(sssss) Sub=xx Prot=xx */

  "A:  FirstIf#=%2d IfCount=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x\n";



static const char *format_iface =

static const char format_iface[] =

/* I:  If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=xxxx*/

  "I:%c If#=%2d Alt=%2d #EPs=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x Driver=%s\n";



static const char *format_endpt =

static const char format_endpt[] =

/* E:  Ad=xx(s) Atr=xx(ssss) MxPS=dddd Ivl=D?s */

  "E:  Ad=%02x(%c) Atr=%02x(%-4s) MxPS=%4d Ivl=%d%cs\n";