diff mbox series

usb: core: hcd: merge repetitive strings in usb_hcd_request_irqs()

Message ID f6ee0fdf-097b-797f-3f8c-beea7c73496e@omp.ru
State New
Headers show
Series usb: core: hcd: merge repetitive strings in usb_hcd_request_irqs() | expand

Commit Message

Sergey Shtylyov Aug. 21, 2021, 8:48 p.m. UTC
Two dev_info() calls in usb_hcd_request_irqs() have the same "io " strings
needlessly repeated. Merge these strings into the format strings of those
dev_info() calls...

Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>

---
The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo...

 drivers/usb/core/hcd.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Greg KH Aug. 26, 2021, 11:32 a.m. UTC | #1
On Sat, Aug 21, 2021 at 11:48:38PM +0300, Sergey Shtylyov wrote:
> Two dev_info() calls in usb_hcd_request_irqs() have the same "io " strings

> needlessly repeated. Merge these strings into the format strings of those

> dev_info() calls...

> 

> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>

> 

> ---

> The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo...

> 

>  drivers/usb/core/hcd.c |   12 ++++++------

>  1 file changed, 6 insertions(+), 6 deletions(-)

> 

> Index: usb/drivers/usb/core/hcd.c

> ===================================================================

> --- usb.orig/drivers/usb/core/hcd.c

> +++ usb/drivers/usb/core/hcd.c

> @@ -2730,16 +2730,16 @@ static int usb_hcd_request_irqs(struct u

>  			return retval;

>  		}

>  		hcd->irq = irqnum;

> -		dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,

> -				(hcd->driver->flags & HCD_MEMORY) ?

> -					"io mem" : "io base",

> -					(unsigned long long)hcd->rsrc_start);

> +		dev_info(hcd->self.controller, "irq %d, io %s 0x%08llx\n",

> +				irqnum, (hcd->driver->flags & HCD_MEMORY) ?

> +					"mem" : "base",

> +				(unsigned long long)hcd->rsrc_start);


This now makes it harder to grep for messages in the kernel source :(

As this saves almost no memory, I'll just ignore this patch.

thanks,

greg k-h
Sergey Shtylyov Aug. 26, 2021, 5:39 p.m. UTC | #2
On 8/26/21 2:32 PM, Greg Kroah-Hartman wrote:
[...]
>> Two dev_info() calls in usb_hcd_request_irqs() have the same "io " strings

>> needlessly repeated. Merge these strings into the format strings of those

>> dev_info() calls...

>>

>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>

>>

>> ---

>> The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo...

>>

>>  drivers/usb/core/hcd.c |   12 ++++++------

>>  1 file changed, 6 insertions(+), 6 deletions(-)

>>

>> Index: usb/drivers/usb/core/hcd.c

>> ===================================================================

>> --- usb.orig/drivers/usb/core/hcd.c

>> +++ usb/drivers/usb/core/hcd.c

>> @@ -2730,16 +2730,16 @@ static int usb_hcd_request_irqs(struct u

>>  			return retval;

>>  		}

>>  		hcd->irq = irqnum;

>> -		dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,

>> -				(hcd->driver->flags & HCD_MEMORY) ?

>> -					"io mem" : "io base",

>> -					(unsigned long long)hcd->rsrc_start);

>> +		dev_info(hcd->self.controller, "irq %d, io %s 0x%08llx\n",

>> +				irqnum, (hcd->driver->flags & HCD_MEMORY) ?

>> +					"mem" : "base",

>> +				(unsigned long long)hcd->rsrc_start);

> 

> This now makes it harder to grep for messages in the kernel source :(


   Mhm, maybe...

> As this saves almost no memory, I'll just ignore this patch.


   I also didn't find the current strings adequate -- I'd understand "io mem" vs "io port",
not what it is now...

> thanks,

> 

> greg k-h


MBR, Sergey
Sergey Shtylyov Aug. 27, 2021, 3:56 p.m. UTC | #3
On 26.08.2021 20:39, Sergey Shtylyov wrote:
[...]
>>> Two dev_info() calls in usb_hcd_request_irqs() have the same "io " strings

>>> needlessly repeated. Merge these strings into the format strings of those

>>> dev_info() calls...

>>>

>>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>

>>>

>>> ---

>>> The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo...

>>>

>>>   drivers/usb/core/hcd.c |   12 ++++++------

>>>   1 file changed, 6 insertions(+), 6 deletions(-)

>>>

>>> Index: usb/drivers/usb/core/hcd.c

>>> ===================================================================

>>> --- usb.orig/drivers/usb/core/hcd.c

>>> +++ usb/drivers/usb/core/hcd.c

>>> @@ -2730,16 +2730,16 @@ static int usb_hcd_request_irqs(struct u

>>>   			return retval;

>>>   		}

>>>   		hcd->irq = irqnum;

>>> -		dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,

>>> -				(hcd->driver->flags & HCD_MEMORY) ?

>>> -					"io mem" : "io base",

>>> -					(unsigned long long)hcd->rsrc_start);

>>> +		dev_info(hcd->self.controller, "irq %d, io %s 0x%08llx\n",

>>> +				irqnum, (hcd->driver->flags & HCD_MEMORY) ?

>>> +					"mem" : "base",

>>> +				(unsigned long long)hcd->rsrc_start);

>>

>> This now makes it harder to grep for messages in the kernel source :(

> 

>     Mhm, maybe...

> 

>> As this saves almost no memory, I'll just ignore this patch.

> 

>     I also didn't find the current strings adequate -- I'd understand "io mem" vs "io port",

> not what it is now...


    Indeed, HCD_MEMORY means MMIO, else means I/O ports. Would the patch 
fixing this substring be acceptable instead of this one?

>> thanks,

>>

>> greg k-h


MBR, Sergey
diff mbox series

Patch

Index: usb/drivers/usb/core/hcd.c
===================================================================
--- usb.orig/drivers/usb/core/hcd.c
+++ usb/drivers/usb/core/hcd.c
@@ -2730,16 +2730,16 @@  static int usb_hcd_request_irqs(struct u
 			return retval;
 		}
 		hcd->irq = irqnum;
-		dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,
-				(hcd->driver->flags & HCD_MEMORY) ?
-					"io mem" : "io base",
-					(unsigned long long)hcd->rsrc_start);
+		dev_info(hcd->self.controller, "irq %d, io %s 0x%08llx\n",
+				irqnum, (hcd->driver->flags & HCD_MEMORY) ?
+					"mem" : "base",
+				(unsigned long long)hcd->rsrc_start);
 	} else {
 		hcd->irq = 0;
 		if (hcd->rsrc_start)
-			dev_info(hcd->self.controller, "%s 0x%08llx\n",
+			dev_info(hcd->self.controller, "io %s 0x%08llx\n",
 					(hcd->driver->flags & HCD_MEMORY) ?
-					"io mem" : "io base",
+						"mem" : "base",
 					(unsigned long long)hcd->rsrc_start);
 	}
 	return 0;