Skip to contentSkip to conversation

atm: horizon: remove h from printk format specifier

PATCH In review [email protected] 2 participants 2 messages Dec 15, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 atm: horizon: remove h from printk format specifier

From: Tom Rix <[email protected]>

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

---
 drivers/atm/horizon.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/atm/horizon.c +3 -3
index 4f2951cbe69c..e110c305fc9c 100644
@@ -1609,7 +1609,7 @@ static int hrz_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
     if (*s++ == 'D') {
 	for (i = 0; i < 4; ++i)
 		d = (d << 4) | hex_to_bin(*s++);
-      PRINTK (KERN_INFO, "debug bitmap is now %hx", debug = d);
+      PRINTK (KERN_INFO, "debug bitmap is now %x", debug = d);
     }
   }
 #endif
@@ -2675,7 +2675,7 @@ static int hrz_probe(struct pci_dev *pci_dev,
 		       "changing", lat, pci_lat);
 		pci_write_config_byte(pci_dev, PCI_LATENCY_TIMER, pci_lat);
 	} else if (lat < MIN_PCI_LATENCY) {
-		PRINTK(KERN_INFO, "%s PCI latency timer from %hu to %hu",
+		PRINTK(KERN_INFO, "%s PCI latency timer from %u to %u",
 		       "increasing", lat, MIN_PCI_LATENCY);
 		pci_write_config_byte(pci_dev, PCI_LATENCY_TIMER, MIN_PCI_LATENCY);
 	}
@@ -2777,7 +2777,7 @@ static void hrz_remove_one(struct pci_dev *pci_dev)
 
 static void __init hrz_check_args (void) {
 #ifdef DEBUG_HORIZON
-  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 debug support in this image");
Signature · 1 line
2.27.0
#1 lore raw
Quoted 8 lines · On Tue, 2020-12-15 at 06:24 -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

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

---
 drivers/atm/horizon.c | 6 +++---

Chas?

Madge has been out of business for a couple decades now.

I doubt anyone does but does anyone actually use this driver or even have working hardware?

If not, how about just deleting this driver altogether instead?

from horizon.h:

/*
Madge Horizon ATM Adapter driver.
Copyright (C) 1995-1999 Madge Networks Ltd.

*/

/*
IMPORTANT NOTE: Madge Networks no longer makes the adapters supported by this driver and makes no commitment to maintain it.
*/

drivers/atm/horizon.c

Quoted 1 line
drivers/atm/horizon.c +0 -0

[]

drivers/atm/horizon.c static int hrz_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) { · line 1612

Quoted 6 lines
drivers/atm/horizon.c +1 -1
@@ -1609,7 +1609,7 @@ static int hrz_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
      if (*s++ == 'D') {
  	for (i = 0; i < 4; ++i)
  		d = (d << 4) | hex_to_bin(*s++);
-      PRINTK (KERN_INFO, "debug bitmap is now %hx", debug = d);
+      PRINTK (KERN_INFO, "debug bitmap is now %x", debug = d);

An IMO ugly assignment in a printk too.