diff options
author | Sanjeev Premi <premi@ti.com> | 2011-02-15 05:57:32 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-17 18:58:35 -0500 |
commit | adc5430b473db2842a96fcce1ffbd43049757d3b (patch) | |
tree | a4216738055c6aeee30a3ee89a076dddb68ab1ce | |
parent | f69eefd18d5201cd512c862a4bd27b8e8febd20b (diff) |
omap3: flash: use pr_err instead of printk
Change all occurences of printf() to pr_err().
Includes minor formatting changes as result of
this change.
Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/board-flash.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index ce61200ae68e..86d1020da151 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c | |||
@@ -73,11 +73,11 @@ __init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) | |||
73 | + FLASH_SIZE_SDPV1 - 1; | 73 | + FLASH_SIZE_SDPV1 - 1; |
74 | } | 74 | } |
75 | if (err < 0) { | 75 | if (err < 0) { |
76 | printk(KERN_ERR "NOR: Can't request GPMC CS\n"); | 76 | pr_err("NOR: Can't request GPMC CS\n"); |
77 | return; | 77 | return; |
78 | } | 78 | } |
79 | if (platform_device_register(&board_nor_device) < 0) | 79 | if (platform_device_register(&board_nor_device) < 0) |
80 | printk(KERN_ERR "Unable to register NOR device\n"); | 80 | pr_err("Unable to register NOR device\n"); |
81 | } | 81 | } |
82 | 82 | ||
83 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ | 83 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ |
@@ -208,7 +208,7 @@ void board_flash_init(struct flash_partitions partition_info[], | |||
208 | */ | 208 | */ |
209 | idx = get_gpmc0_type(); | 209 | idx = get_gpmc0_type(); |
210 | if (idx >= MAX_SUPPORTED_GPMC_CONFIG) { | 210 | if (idx >= MAX_SUPPORTED_GPMC_CONFIG) { |
211 | printk(KERN_ERR "%s: Invalid chip select: %d\n", __func__, cs); | 211 | pr_err("%s: Invalid chip select: %d\n", __func__, cs); |
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | config_sel = (unsigned char *)(chip_sel_board[idx]); | 214 | config_sel = (unsigned char *)(chip_sel_board[idx]); |
@@ -232,22 +232,19 @@ void board_flash_init(struct flash_partitions partition_info[], | |||
232 | } | 232 | } |
233 | 233 | ||
234 | if (norcs > GPMC_CS_NUM) | 234 | if (norcs > GPMC_CS_NUM) |
235 | printk(KERN_INFO "NOR: Unable to find configuration " | 235 | pr_err("NOR: Unable to find configuration in GPMC\n"); |
236 | "in GPMC\n"); | ||
237 | else | 236 | else |
238 | board_nor_init(partition_info[0].parts, | 237 | board_nor_init(partition_info[0].parts, |
239 | partition_info[0].nr_parts, norcs); | 238 | partition_info[0].nr_parts, norcs); |
240 | 239 | ||
241 | if (onenandcs > GPMC_CS_NUM) | 240 | if (onenandcs > GPMC_CS_NUM) |
242 | printk(KERN_INFO "OneNAND: Unable to find configuration " | 241 | pr_err("OneNAND: Unable to find configuration in GPMC\n"); |
243 | "in GPMC\n"); | ||
244 | else | 242 | else |
245 | board_onenand_init(partition_info[1].parts, | 243 | board_onenand_init(partition_info[1].parts, |
246 | partition_info[1].nr_parts, onenandcs); | 244 | partition_info[1].nr_parts, onenandcs); |
247 | 245 | ||
248 | if (nandcs > GPMC_CS_NUM) | 246 | if (nandcs > GPMC_CS_NUM) |
249 | printk(KERN_INFO "NAND: Unable to find configuration " | 247 | pr_err("NAND: Unable to find configuration in GPMC\n"); |
250 | "in GPMC\n"); | ||
251 | else | 248 | else |
252 | board_nand_init(partition_info[2].parts, | 249 | board_nand_init(partition_info[2].parts, |
253 | partition_info[2].nr_parts, nandcs); | 250 | partition_info[2].nr_parts, nandcs); |