Skip to contentSkip to conversation

atkbd shaddup

PATCH Matthew Galgoci 1 participant 1 message Mar 15, 2004 1 message not in the archive Input drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Ok, here is the revised patch based on Pavel's feedback:

drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +2 -2
@@ -197,7 +197,7 @@
 
 #if !defined(__i386__) && !defined (__x86_64__)
 	if ((flags & (SERIO_FRAME | SERIO_PARITY)) && (~flags & SERIO_TIMEOUT) && !atkbd->resend && atkbd->write) {
-		printk("atkbd.c: frame/parity error: %02x\n", flags);
+		printk(KERN_WARNING "atkbd.c: frame/parity error: %02x\n", flags);
 		serio_write(serio, ATKBD_CMD_RESEND);
 		atkbd->resend = 1;
 		goto out;
@@ -258,7 +258,7 @@
 			atkbd_report_key(&atkbd->dev, regs, KEY_HANJA, 3);
 			goto out;
 		case ATKBD_RET_ERR:
-			printk(KERN_WARNING "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
+			printk(KERN_INFO "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
 			goto out;
 	}
 

If there are no more objections, please apply.

Regards,

Matthew Galgoci

Quoted 93 lines · Pavel Machek
Quoted 7 lines

Hi,

Pavel, how is this:

drivers/input/keyboard/atkbd.c line 203

Quoted 8 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +1 -1
@@ -197,7 +197,7 @@
 
 #if !defined(__i386__) && !defined (__x86_64__)
 	if ((flags & (SERIO_FRAME | SERIO_PARITY)) && (~flags & SERIO_TIMEOUT) && !atkbd->resend && atkbd->write) {
-		printk("atkbd.c: frame/parity error: %02x\n", flags);
+		printk(KERN_WARNING "atkbd.c: frame/parity error: %02x\n", flags);
 		serio_write(serio, ATKBD_CMD_RESEND);
 		atkbd->resend = 1;
 		goto out;

Ok.

drivers/input/keyboard/atkbd.c line 264

Quoted 9 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +1 -1
@@ -258,7 +258,7 @@
 			atkbd_report_key(&atkbd->dev, regs, KEY_HANJA, 3);
 			goto out;
 		case ATKBD_RET_ERR:
-			printk(KERN_WARNING "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
+			printk(KERN_INFO "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
 			goto out;
 	}
 

Ok.

Quoted 7 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +1 -1
@@ -274,15 +274,15 @@
 		case ATKBD_KEY_NULL:
 			break;
 		case ATKBD_KEY_UNKNOWN:
-			printk(KERN_WARNING "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n",
+			printk(KERN_INFO "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n",
 				atkbd->release ? "released" : "pressed",

drivers/input/keyboard/atkbd.c line 286

Quoted 10 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +2 -2
 				atkbd->translated ? "translated" : "raw", 
 				atkbd->set, code, serio->phys);
 			if (atkbd->translated && atkbd->set == 2 && code == 0x7a)
-				printk(KERN_WARNING "atkbd.c: This is an XFree86 bug. It shouldn't access"
+				printk(KERN_INFO "atkbd.c: This is an XFree86 bug. It shouldn't access"
 					" hardware directly.\n");
 			else
-				printk(KERN_WARNING "atkbd.c: Use 'setkeycodes %s%02x <keycode>' to make it known.\n",						code & 0x80 ? "e0" : "", code & 0x7f);
+				printk(KERN_INFO "atkbd.c: Use 'setkeycodes %s%02x <keycode>' to make it known.\n",						code & 0x80 ? "e0" : "", code & 0x7f);
 			break;

I'd leave those at WARNING level.

drivers/input/keyboard/atkbd.c line 503

Quoted 13 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +2 -2
 		default:
 			value = atkbd->release ? 0 :
@@ -496,8 +496,8 @@
 	atkbd->id = (param[0] << 8) | param[1];
 
 	if (atkbd->id == 0xaca1 && atkbd->translated) {
-		printk(KERN_ERR "atkbd.c: NCD terminal keyboards are only supported on non-translating\n");
-		printk(KERN_ERR "atkbd.c: controllers. Use i8042.direct=1 to disable translation.\n");
+		printk(KERN_WARNING "atkbd.c: NCD terminal keyboards are only supported on non-translating\n");
+		printk(KERN_WARNING "atkbd.c: controllers. Use i8042.direct=1 to disable translation.\n");
 		return -1;
 	}
 

This is hard error. Leave it as such.

drivers/input/keyboard/atkbd.c line 594

Quoted 9 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +1 -1
@@ -588,7 +588,7 @@
  */
 
 	if (atkbd_command(atkbd, NULL, ATKBD_CMD_ENABLE)) {
-		printk(KERN_ERR "atkbd.c: Failed to enable keyboard on %s\n",
+		printk(KERN_WARNING "atkbd.c: Failed to enable keyboard on %s\n",
 			atkbd->serio->phys);
 		return -1;
 	}

Same here.

drivers/input/keyboard/atkbd.c line 750

Quoted 9 lines
drivers/input/keyboard/atkbd.c renamed from drivers/input/keyboard/atkbd.c.orig +1 -1
@@ -744,7 +744,7 @@
 	int i;
 
         if (!dev) {
-                printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
+                printk(KERN_WARNING "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
                 return -1;
         }
 

I do not know about this one....

Pavel

Signature · 4 lines
Matthew Galgoci
System Administrator
Red Hat, Inc
919.754.3700 x44155