diff mbox series

atm: ambassador: remove h from printk format specifier

Message ID 20201215142228.1847161-1-trix@redhat.com
State New
Headers show
Series atm: ambassador: remove h from printk format specifier | expand

Commit Message

Tom Rix Dec. 15, 2020, 2:22 p.m. UTC
From: Tom Rix <trix@redhat.com>

See Documentation/core-api/printk-formats.rst.
h should no longer be used in the format specifier for printk.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/atm/ambassador.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jakub Kicinski Dec. 17, 2020, 12:45 a.m. UTC | #1
On Tue, 15 Dec 2020 06:22:28 -0800 trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>

> 

> See Documentation/core-api/printk-formats.rst.

> h should no longer be used in the format specifier for printk.

> 

> Signed-off-by: Tom Rix <trix@redhat.com>


That's for new code I assume?

What's the harm in leaving this ancient code be?

> diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c

> index c039b8a4fefe..6b0fff8c0141 100644

> --- a/drivers/atm/ambassador.c

> +++ b/drivers/atm/ambassador.c

> @@ -2169,7 +2169,7 @@ static void setup_pci_dev(struct pci_dev *pci_dev)

>  		pci_lat = (lat < MIN_PCI_LATENCY) ? MIN_PCI_LATENCY : lat;

>  

>  	if (lat != pci_lat) {

> -		PRINTK (KERN_INFO, "Changing PCI latency timer from %hu to %hu",

> +		PRINTK (KERN_INFO, "Changing PCI latency timer from %u to %u",

>  			lat, pci_lat);

>  		pci_write_config_byte(pci_dev, PCI_LATENCY_TIMER, pci_lat);

>  	}

> @@ -2300,7 +2300,7 @@ static void __init amb_check_args (void) {

>    unsigned int max_rx_size;

>    

>  #ifdef DEBUG_AMBASSADOR

> -  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);

> +  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);

>  #else

>    if (debug)

>      PRINTK (KERN_NOTICE, "no debugging support");
Tom Rix Dec. 17, 2020, 1:17 p.m. UTC | #2
On 12/16/20 4:45 PM, Jakub Kicinski wrote:
> On Tue, 15 Dec 2020 06:22:28 -0800 trix@redhat.com wrote:

>> From: Tom Rix <trix@redhat.com>

>>

>> See Documentation/core-api/printk-formats.rst.

>> h should no longer be used in the format specifier for printk.

>>

>> Signed-off-by: Tom Rix <trix@redhat.com>

> That's for new code I assume?

>

> What's the harm in leaving this ancient code be?


This change is part of a tree wide cleanup.

drivers/atm status is listed as Maintained in MAINTAINERS so changes like this should be ok.

Should drivers/atm status be changed?

Tom

>

>> diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c

>> index c039b8a4fefe..6b0fff8c0141 100644

>> --- a/drivers/atm/ambassador.c

>> +++ b/drivers/atm/ambassador.c

>> @@ -2169,7 +2169,7 @@ static void setup_pci_dev(struct pci_dev *pci_dev)

>>  		pci_lat = (lat < MIN_PCI_LATENCY) ? MIN_PCI_LATENCY : lat;

>>  

>>  	if (lat != pci_lat) {

>> -		PRINTK (KERN_INFO, "Changing PCI latency timer from %hu to %hu",

>> +		PRINTK (KERN_INFO, "Changing PCI latency timer from %u to %u",

>>  			lat, pci_lat);

>>  		pci_write_config_byte(pci_dev, PCI_LATENCY_TIMER, pci_lat);

>>  	}

>> @@ -2300,7 +2300,7 @@ static void __init amb_check_args (void) {

>>    unsigned int max_rx_size;

>>    

>>  #ifdef DEBUG_AMBASSADOR

>> -  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);

>> +  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);

>>  #else

>>    if (debug)

>>      PRINTK (KERN_NOTICE, "no debugging support");
Jakub Kicinski Dec. 17, 2020, 5:28 p.m. UTC | #3
On Thu, 17 Dec 2020 05:17:24 -0800 Tom Rix wrote:
> On 12/16/20 4:45 PM, Jakub Kicinski wrote:

> > On Tue, 15 Dec 2020 06:22:28 -0800 trix@redhat.com wrote:  

> >> From: Tom Rix <trix@redhat.com>

> >>

> >> See Documentation/core-api/printk-formats.rst.

> >> h should no longer be used in the format specifier for printk.

> >>

> >> Signed-off-by: Tom Rix <trix@redhat.com>  

> > That's for new code I assume?

> >

> > What's the harm in leaving this ancient code be?  

> 

> This change is part of a tree wide cleanup.


What's the purpose of the "clean up"? Why is it making the code better?

This is a quote from your change:

-  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);
+  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);

Are you sure that the use of %hx is the worst part of that line?

> drivers/atm status is listed as Maintained in MAINTAINERS so changes

> like this should be ok.

> 

> Should drivers/atm status be changed?


Up to Chas, but AFAIU we're probably only a few years away from ATM as 
a whole walking into the light. So IMHO "Obsolete" would be justified.
Tom Rix Dec. 17, 2020, 10:03 p.m. UTC | #4
On 12/17/20 9:28 AM, Jakub Kicinski wrote:
> On Thu, 17 Dec 2020 05:17:24 -0800 Tom Rix wrote:

>> On 12/16/20 4:45 PM, Jakub Kicinski wrote:

>>> On Tue, 15 Dec 2020 06:22:28 -0800 trix@redhat.com wrote:  

>>>> From: Tom Rix <trix@redhat.com>

>>>>

>>>> See Documentation/core-api/printk-formats.rst.

>>>> h should no longer be used in the format specifier for printk.

>>>>

>>>> Signed-off-by: Tom Rix <trix@redhat.com>  

>>> That's for new code I assume?

>>>

>>> What's the harm in leaving this ancient code be?  

>> This change is part of a tree wide cleanup.

> What's the purpose of the "clean up"? Why is it making the code better?

>

> This is a quote from your change:

>

> -  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);

> +  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);

>

> Are you sure that the use of %hx is the worst part of that line?


In this case, it means this bit of code is compliant with the %h checker in checkpatch.

why you are seeing this change for %hx and not the horrible debug &= or the old PRINTK macro is because the change was mechanical.

leveraging the clang build and a special fixit for %h, an allyesconfig for x86_64 cleans this problem from most of the tree in about an hour.  atm/ was just one of the places it hit, there are about 100 more.

If you want the debug &= fixed, i can do that.

The macro is a treewide problem and i can add that to the treewide cleanups i am planning.

Tom

>

>> drivers/atm status is listed as Maintained in MAINTAINERS so changes

>> like this should be ok.

>>

>> Should drivers/atm status be changed?

> Up to Chas, but AFAIU we're probably only a few years away from ATM as 

> a whole walking into the light. So IMHO "Obsolete" would be justified.

>
Jakub Kicinski Dec. 18, 2020, 6:02 p.m. UTC | #5
On Thu, 17 Dec 2020 14:03:07 -0800 Tom Rix wrote:
> On 12/17/20 9:28 AM, Jakub Kicinski wrote:

> > On Thu, 17 Dec 2020 05:17:24 -0800 Tom Rix wrote:  

> >> On 12/16/20 4:45 PM, Jakub Kicinski wrote:  

> >>> On Tue, 15 Dec 2020 06:22:28 -0800 trix@redhat.com wrote:    

> >>>> From: Tom Rix <trix@redhat.com>

> >>>>

> >>>> See Documentation/core-api/printk-formats.rst.

> >>>> h should no longer be used in the format specifier for printk.

> >>>>

> >>>> Signed-off-by: Tom Rix <trix@redhat.com>    

> >>> That's for new code I assume?

> >>>

> >>> What's the harm in leaving this ancient code be?    

> >> This change is part of a tree wide cleanup.  

> > What's the purpose of the "clean up"? Why is it making the code better?

> >

> > This is a quote from your change:

> >

> > -  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);

> > +  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);

> >

> > Are you sure that the use of %hx is the worst part of that line?  

> 

> In this case, it means this bit of code is compliant with the %h checker in checkpatch.

> 

> why you are seeing this change for %hx and not the horrible debug &= or the old PRINTK macro is because the change was mechanical.

> 

> leveraging the clang build and a special fixit for %h, an allyesconfig for x86_64 cleans this problem from most of the tree in about an hour.  atm/ was just one of the places it hit, there are about 100 more.

> 

> If you want the debug &= fixed, i can do that.


No, the opposite of that. I would like to see fewer patches touching
prehistoric code for little to no gain :(

> The macro is a treewide problem and i can add that to the treewide cleanups i am planning.
diff mbox series

Patch

diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index c039b8a4fefe..6b0fff8c0141 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2169,7 +2169,7 @@  static void setup_pci_dev(struct pci_dev *pci_dev)
 		pci_lat = (lat < MIN_PCI_LATENCY) ? MIN_PCI_LATENCY : lat;
 
 	if (lat != pci_lat) {
-		PRINTK (KERN_INFO, "Changing PCI latency timer from %hu to %hu",
+		PRINTK (KERN_INFO, "Changing PCI latency timer from %u to %u",
 			lat, pci_lat);
 		pci_write_config_byte(pci_dev, PCI_LATENCY_TIMER, pci_lat);
 	}
@@ -2300,7 +2300,7 @@  static void __init amb_check_args (void) {
   unsigned int max_rx_size;
   
 #ifdef DEBUG_AMBASSADOR
-  PRINTK (KERN_NOTICE, "debug bitmap is %hx", debug &= DBG_MASK);
+  PRINTK (KERN_NOTICE, "debug bitmap is %x", debug &= DBG_MASK);
 #else
   if (debug)
     PRINTK (KERN_NOTICE, "no debugging support");