Skip to contentSkip to conversation

omap3: minor clean-up in flash related code

PATCH New Sanjeev Premi 2 participants 4 messages Feb 15, 2011 – Feb 17, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Sanjeev Premi

author
#0 lore raw

cover omap3: minor clean-up in flash related code

Changes include:
- fixing typos
- using pr_err() instead of printk

Sanjeev Premi (2):
omap3: fix minor typos
omap3: flash: use pr_err instead of printk

 arch/arm/mach-omap2/board-flash.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.2.2
author
#1 lore raw

PATCH 1/2 omap3: fix minor typos

This patch fixes typos that were remaining after
the file and functions were renamed.

Signed-off-by Sanjeev Premi <[email protected]>
---
 arch/arm/mach-omap2/board-flash.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-flash.c +2 -2
index fd38c05..ce61200 100644
@@ -1,5 +1,5 @@
 /*
- * board-sdp-flash.c
+ * board-flash.c
  * Modified from mach-omap2/board-3430sdp-flash.c
  *
  * Copyright (C) 2009 Nokia Corporation

@@ -189,7 +189,7 @@ unmap:
 }
 
 /**
- * sdp3430_flash_init - Identify devices connected to GPMC and register.
+ * board_flash_init - Identify devices connected to GPMC and register.
  *
  * @return - void.
  */
Signature · 1 line
1.7.2.2
author
#2 lore raw

PATCH 2/2 omap3: flash: use pr_err instead of printk

In reply to Sanjeev Premi

Change all occurences of printf() to pr_err().
Includes minor formatting changes as result of
this change.

Signed-off-by Sanjeev Premi <[email protected]>
---
 arch/arm/mach-omap2/board-flash.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/board-flash.c +6 -9
index ce61200..86d1020 100644
@@ -73,11 +73,11 @@ __init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
 					+ FLASH_SIZE_SDPV1 - 1;
 	}
 	if (err < 0) {
-		printk(KERN_ERR "NOR: Can't request GPMC CS\n");
+		pr_err("NOR: Can't request GPMC CS\n");
 		return;
 	}
 	if (platform_device_register(&board_nor_device) < 0)
-		printk(KERN_ERR	"Unable to register NOR device\n");
+		pr_err("Unable to register NOR device\n");
 }
 
 #if defined(CONFIG_MTD_ONENAND_OMAP2) || \

@@ -208,7 +208,7 @@ void board_flash_init(struct flash_partitions partition_info[],
 	 */
 	idx = get_gpmc0_type();
 	if (idx >= MAX_SUPPORTED_GPMC_CONFIG) {
-		printk(KERN_ERR "%s: Invalid chip select: %d\n", __func__, cs);
+		pr_err("%s: Invalid chip select: %d\n", __func__, cs);
 		return;
 	}
 	config_sel = (unsigned char *)(chip_sel_board[idx]);

@@ -232,22 +232,19 @@ void board_flash_init(struct flash_partitions partition_info[],
 	}
 
 	if (norcs > GPMC_CS_NUM)
-		printk(KERN_INFO "NOR: Unable to find configuration "
-				"in GPMC\n");
+		pr_err("NOR: Unable to find configuration in GPMC\n");
 	else
 		board_nor_init(partition_info[0].parts,
 				partition_info[0].nr_parts, norcs);
 
 	if (onenandcs > GPMC_CS_NUM)
-		printk(KERN_INFO "OneNAND: Unable to find configuration "
-				"in GPMC\n");
+		pr_err("OneNAND: Unable to find configuration in GPMC\n");
 	else
 		board_onenand_init(partition_info[1].parts,
 					partition_info[1].nr_parts, onenandcs);
 
 	if (nandcs > GPMC_CS_NUM)
-		printk(KERN_INFO "NAND: Unable to find configuration "
-				"in GPMC\n");
+		pr_err("NAND: Unable to find configuration in GPMC\n");
 	else
 		board_nand_init(partition_info[2].parts,
 				partition_info[2].nr_parts, nandcs);
Signature · 1 line
1.7.2.2
maintainer
#3 lore raw

cover omap3: minor clean-up in flash related code

In reply to Sanjeev Premi
Quoted 3 lines · Sanjeev Premi

Changes include:
- fixing typos
- using pr_err() instead of printk

Thanks, applying to devel-cleanup for the upcoming merge window.

Tony