Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adc5430b authored by Sanjeev Premi's avatar Sanjeev Premi Committed by Tony Lindgren
Browse files

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: default avatarSanjeev Premi <premi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f69eefd1

arch/arm/mach-omap2/board-flash.c

+6 −9
Original line number Diff line number Diff line
@@ -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);