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

Commit da675b4e authored by Lei Wen's avatar Lei Wen Committed by Artem Bityutskiy
Browse files

mtd: pxa3xx_nand: convert all printk into dev_* 



Also add missed warning message.

Signed-off-by: default avatarLei Wen <leiwen@marvell.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@intel.com>
parent 051fc41c

drivers/mtd/nand/pxa3xx_nand.c

+16 −11
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void handle_data_pio(struct pxa3xx_nand_info *info) 
					DIV_ROUND_UP(info->oob_size, 4));

		break;

	default:

		printk(KERN_ERR "%s: invalid state %d\n", __func__,

		dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,

				info->state);

		BUG();

	}
@@ -385,7 +385,7 @@ static void start_data_dma(struct pxa3xx_nand_info *info) 
		desc->dcmd |= DCMD_INCTRGADDR | DCMD_FLOWSRC;

		break;

	default:

		printk(KERN_ERR "%s: invalid state %d\n", __func__,

		dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,

				info->state);

		BUG();

	}
@@ -616,8 +616,8 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command, 


	default:

		exec_cmd = 0;

		printk(KERN_ERR "pxa3xx-nand: non-supported"

			" command %x\n", command);

		dev_err(&info->pdev->dev, "non-supported command %x\n",

				command);

		break;

	}
@@ -646,7 +646,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command, 
		ret = wait_for_completion_timeout(&info->cmd_complete,

				CHIP_DELAY_TIMEOUT);

		if (!ret) {

			printk(KERN_ERR "Wait time out!!!\n");

			dev_err(&info->pdev->dev, "Wait time out!!!\n");

			/* Stop State Machine for next command cycle */

			pxa3xx_nand_stop(info);

		}
@@ -774,11 +774,15 @@ static int pxa3xx_nand_config_flash(struct pxa3xx_nand_info *info, 
	struct pxa3xx_nand_platform_data *pdata = pdev->dev.platform_data;

	uint32_t ndcr = 0x0; /* enable all interrupts */



	if (f->page_size != 2048 && f->page_size != 512)

	if (f->page_size != 2048 && f->page_size != 512) {

		dev_err(&pdev->dev, "Current only support 2048 and 512 size\n");

		return -EINVAL;

	}



	if (f->flash_width != 16 && f->flash_width != 8)

	if (f->flash_width != 16 && f->flash_width != 8) {

		dev_err(&pdev->dev, "Only support 8bit and 16 bit!\n");

		return -EINVAL;

	}



	/* calculate flash information */

	info->cmdset = &default_cmdset;
@@ -898,7 +902,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) 
	if (!ret) {

		kfree(mtd);

		info->mtd = NULL;

		printk(KERN_INFO "There is no nand chip on cs 0!\n");

		dev_info(&info->pdev->dev, "There is no nand chip on cs 0!\n");



		return -EINVAL;

	}
@@ -906,11 +910,12 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) 
	chip->cmdfunc(mtd, NAND_CMD_READID, 0, 0);

	id = *((uint16_t *)(info->data_buff));

	if (id != 0)

		printk(KERN_INFO "Detect a flash id %x\n", id);

		dev_info(&info->pdev->dev, "Detect a flash id %x\n", id);

	else {

		kfree(mtd);

		info->mtd = NULL;

		printk(KERN_WARNING "Read out ID 0, potential timing set wrong!!\n");

		dev_warn(&info->pdev->dev,

			 "Read out ID 0, potential timing set wrong!!\n");



		return -EINVAL;

	}
@@ -930,7 +935,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) 
	if (i >= (ARRAY_SIZE(builtin_flash_types) + pdata->num_flash - 1)) {

		kfree(mtd);

		info->mtd = NULL;

		printk(KERN_ERR "ERROR!! flash not defined!!!\n");

		dev_err(&info->pdev->dev, "ERROR!! flash not defined!!!\n");



		return -EINVAL;

	}