Skip to contentSkip to conversation

printk : arch/arm/mach-omap1/board-h2.c

PATCH In review Christophe Lucas 3 participants 13 messages May 15, 2006 – May 26, 2006

Subsystems (4)
Arm (32-bit) Arm sub-architectures Kernel janitors OMAP1 support
lore
Share & tools
lore

Christophe Lucas

author
#0 lore raw

PATCH 1/1 printk : arch/arm/mach-omap1/board-h2.c

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-h2.c +1 -1
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h2.c
===================================================================
@@ -121,7 +121,7 @@
 static void __init h2_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#1 lore raw

PATCH 1/1 printk : arch/arm/mach-omap1/board-h3.c

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-h3.c +1 -1
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h3.c
===================================================================
@@ -196,7 +196,7 @@
 {
 	omap_cfg_reg(W15_1710_GPIO40);
 	if (omap_request_gpio(40) < 0) {
-		printk("Error requesting gpio 40 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 40 for smc91x irq\n");
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#2 lore raw

PATCH 1/1 printk : arch/arm/mach-omap1/board-innovator.c

In reply to Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-innovator.c +2 -2
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-innovator.c
===================================================================
@@ -173,7 +173,7 @@
 		udelay(750);
 	} else {
 		if ((omap_request_gpio(0)) < 0) {
-			printk("Error requesting gpio 0 for smc91x irq\n");
+			printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");
 			return;
 		}
 	}

@@ -294,7 +294,7 @@
 		udelay(10);	/* Delay needed for FPGA */
 
 		/* Dump the Innovator FPGA rev early - useful info for support. */
-		printk("Innovator FPGA Rev %d.%d Board Rev %d\n",
+		printk(KERN_INFO "Innovator FPGA Rev %d.%d Board Rev %d\n",
 		       fpga_read(OMAP1510_FPGA_REV_HIGH),
 		       fpga_read(OMAP1510_FPGA_REV_LOW),
 		       fpga_read(OMAP1510_FPGA_BOARD_REV));

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#3 lore raw

PATCH 1/1 printk : arch/arm/mach-omap1/board-osk.c

In reply to Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-osk.c +2 -2
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-osk.c
===================================================================
@@ -148,7 +148,7 @@
 static void __init osk_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");
 		return;
 	}
 

@@ -160,7 +160,7 @@
 {
 	omap_cfg_reg(M7_1610_GPIO62);
 	if ((omap_request_gpio(62)) < 0) {
-		printk("Error requesting gpio 62 for CF irq\n");
+		printk(KERN_WARNING "Error requesting gpio 62 for CF irq\n");
 		return;
 	}
 	/* the CF I/O IRQ is really active-low */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#4 lore raw
In reply to Christophe Lucas
Quoted 11 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h2.c
===================================================================

arch/arm/mach-omap1/board-h2.c line 124

Quoted 5 lines
arch/arm/mach-omap1/board-h2.c +1 -1
@@ -121,7 +121,7 @@
 static void __init h2_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");

On error path. KERN_ERR here.

arch/arm/mach-omap1/board-h2.c line 127

Quoted 3 lines
arch/arm/mach-omap1/board-h2.c +0 -0
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#5 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/board-h3.c

In reply to Christophe Lucas
Quoted 11 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h3.c
===================================================================

arch/arm/mach-omap1/board-h3.c line 199

Quoted 5 lines
arch/arm/mach-omap1/board-h3.c +1 -1
@@ -196,7 +196,7 @@
 {
 	omap_cfg_reg(W15_1710_GPIO40);
 	if (omap_request_gpio(40) < 0) {
-		printk("Error requesting gpio 40 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 40 for smc91x irq\n");

Ditto KERN_ERR.

arch/arm/mach-omap1/board-h3.c line 202

Quoted 3 lines
arch/arm/mach-omap1/board-h3.c +0 -0
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#6 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/board-osk.c

In reply to Christophe Lucas
Quoted 12 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-osk.c
===================================================================

arch/arm/mach-omap1/board-osk.c line 151

Quoted 5 lines
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -148,7 +148,7 @@
 static void __init osk_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");

KERN_ERR

arch/arm/mach-omap1/board-osk.c line 163

Quoted 9 lines
arch/arm/mach-omap1/board-osk.c +1 -1
 		return;
 	}
 

@@ -160,7 +160,7 @@
 {
 	omap_cfg_reg(M7_1610_GPIO62);
 	if ((omap_request_gpio(62)) < 0) {
-		printk("Error requesting gpio 62 for CF irq\n");
+		printk(KERN_WARNING "Error requesting gpio 62 for CF irq\n");

Ditto.

arch/arm/mach-omap1/board-osk.c line 166

Quoted 3 lines
arch/arm/mach-omap1/board-osk.c +0 -0
 		return;
 	}
 	/* the CF I/O IRQ is really active-low */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#7 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/board-innovator.c

In reply to Christophe Lucas
Quoted 12 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-innovator.c
===================================================================

arch/arm/mach-omap1/board-innovator.c line 176

Quoted 5 lines
arch/arm/mach-omap1/board-innovator.c +1 -1
@@ -173,7 +173,7 @@
 		udelay(750);
 	} else {
 		if ((omap_request_gpio(0)) < 0) {
-			printk("Error requesting gpio 0 for smc91x irq\n");
+			printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");

Ditto KERN_ERR.

arch/arm/mach-omap1/board-innovator.c line 179

Quoted 3 lines
arch/arm/mach-omap1/board-innovator.c +0 -0
 			return;
 		}
 	}

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#8 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/board-h3.c

In reply to Christophe Lucas
Quoted 6 lines · Arthur Othieno

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h3.c

arch/arm/mach-omap1/board-h3.c

Quoted 3 lines

===================================================================

arch/arm/mach-omap1/board-h3.c +0 -0

Ditto KERN_ERR.

Ok Here is the corriged patch:

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-h3.c +1 -1
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h3.c
===================================================================
@@ -196,7 +196,7 @@
 {
 	omap_cfg_reg(W15_1710_GPIO40);
 	if (omap_request_gpio(40) < 0) {
-		printk("Error requesting gpio 40 for smc91x irq\n");
+		printk(KERN_ERR "Error requesting gpio 40 for smc91x irq\n");
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#9 lore raw
In reply to Christophe Lucas
Quoted 7 lines · Arthur Othieno
Quoted 6 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
Quoted 16 lines

arch/arm/mach-omap1/board-h2.c line 124

Quoted 10 lines

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h2.c
===================================================================

arch/arm/mach-omap1/board-h2.c +1 -1
@@ -121,7 +121,7 @@
 static void __init h2_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");

On error path. KERN_ERR here.

Quoted 3 lines
arch/arm/mach-omap1/board-h2.c +0 -0
 		return;
 	}
 }

Ok here it is the corriged patch :

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-h2.c +1 -1
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-h2.c
===================================================================
@@ -121,7 +121,7 @@
 static void __init h2_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_ERR "Error requesting gpio 0 for smc91x irq\n");
 		return;
 	}
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#10 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/board-osk.c

In reply to Christophe Lucas
Quoted 24 lines · Arthur Othieno
Quoted 12 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/board-osk.c
===================================================================

arch/arm/mach-omap1/board-osk.c line 151

Quoted 5 lines
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -148,7 +148,7 @@
 static void __init osk_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_WARNING "Error requesting gpio 0 for smc91x irq\n");

KERN_ERR

Quoted 3 lines
arch/arm/mach-omap1/board-osk.c +0 -0
 		return;
 	}
Quoted 12 lines

arch/arm/mach-omap1/board-osk.c line 163

Quoted 6 lines
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -160,7 +160,7 @@
 {
 	omap_cfg_reg(M7_1610_GPIO62);
 	if ((omap_request_gpio(62)) < 0) {
-		printk("Error requesting gpio 62 for CF irq\n");
+		printk(KERN_WARNING "Error requesting gpio 62 for CF irq\n");

Ditto.

Quoted 3 lines
arch/arm/mach-omap1/board-osk.c +0 -0
 		return;
 	}
 	/* the CF I/O IRQ is really active-low */

Here it is the corriged version :

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>
arch/arm/mach-omap1/board-osk.c +2 -2
Index: linux-2.6.16.16/arch/arm/mach-omap1/board-osk.c
===================================================================
@@ -148,7 +148,7 @@
 static void __init osk_init_smc91x(void)
 {
 	if ((omap_request_gpio(0)) < 0) {
-		printk("Error requesting gpio 0 for smc91x irq\n");
+		printk(KERN_ERR "Error requesting gpio 0 for smc91x irq\n");
 		return;
 	}
 

@@ -160,7 +160,7 @@
 {
 	omap_cfg_reg(M7_1610_GPIO62);
 	if ((omap_request_gpio(62)) < 0) {
-		printk("Error requesting gpio 62 for CF irq\n");
+		printk(KERN_ERR "Error requesting gpio 62 for CF irq\n");
 		return;
 	}
 	/* the CF I/O IRQ is really active-low */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#11 lore raw

PATCH 1/1 printk : arch/arm/mach-omap1/id.c

In reply to Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

Signed-off-by Christophe Lucas <[email protected]>

Index: linux-2.6.16.16/arch/arm/mach-omap1/id.c
=================================--- linux-2.6.16.16.orig/arch/arm/mach-omap1/id.c 2006-05-11 03:56:24.000000000 +0200
+++ linux-2.6.16.16/arch/arm/mach-omap1/id.c 2006-05-24 17:35:22.000000000 +0200
@@ -123,17 +123,17 @@
omap_id = omap_readl(OMAP32_ID_0);

#ifdef DEBUG
- printk("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
- printk("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
+ printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
+ printk(KERN_DEBUG "OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
omap_readl(OMAP_DIE_ID_1),
(omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
- printk("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
- printk("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
+ printk(KERN_DEBUG "OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
+ printk(KERN_DEBUG "OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
omap_readl(OMAP_PRODUCTION_ID_1), omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
- printk("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
- printk("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
- printk("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
+ printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
+ printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+ printk(KERN_DEBUG "JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
#endif

system_serial_high = omap_readl(OMAP_DIE_ID_0);
_______________________________________________
Kernel-janitors mailing list [email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#12 lore raw

Re: [KJ] [PATCH] printk : arch/arm/mach-omap1/id.c

In reply to Christophe Lucas

arch/arm/mach-omap1/id.c line 126

Quoted 13 lines · Christophe Lucas

Description:
printk should include appropriate KERN_* constant (of course only at beginning of lines).

arch/arm/mach-omap1/id.c +1 -2
@@ -123,17 +123,17 @@
 	omap_id = omap_readl(OMAP32_ID_0);
 
 #ifdef DEBUG
-	printk("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
-	printk("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
+	printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));

That would be pr_debug(), no? And you can drop #ifdef too.

Quoted 6 lines
arch/arm/mach-omap1/id.c +2 -2
+	printk(KERN_DEBUG "OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
 		omap_readl(OMAP_DIE_ID_1),
 	       (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
-	printk("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
-	printk("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
+	printk(KERN_DEBUG "OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));

arch/arm/mach-omap1/id.c line 137

Quoted 10 lines
arch/arm/mach-omap1/id.c +4 -3
+	printk(KERN_DEBUG "OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
 		omap_readl(OMAP_PRODUCTION_ID_1),
 		omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
-	printk("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
-	printk("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
-	printk("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
+	printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
+	printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+	printk(KERN_DEBUG "JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
 #endif

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors