evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: pxa3xx_nand: convert all printk into dev_*

Browse source 
Also add missed warning message.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
This commit is contained in:
Lei Wen 2011-07-14 20:44:31 -07:00 • committed by Artem Bityutskiy
parent 051fc41c2e
commit da675b4ef2
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/mtd/nand/pxa3xx_nand.c
View file

@ -359,7 +359,7 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
DIV_ROUND_UP(info->oob_size, 4)); DIV_ROUND_UP(info->oob_size, 4));
break; break;
default: default:
printk(KERN_ERR "%s: invalid state %d\n", __func__, dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
info->state); info->state);
BUG(); BUG();
} }
@ -385,7 +385,7 @@ static void start_data_dma(struct pxa3xx_nand_info *info)
desc->dcmd |= DCMD_INCTRGADDR | DCMD_FLOWSRC; desc->dcmd |= DCMD_INCTRGADDR | DCMD_FLOWSRC;
break; break;
default: default:
printk(KERN_ERR "%s: invalid state %d\n", __func__, dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
info->state); info->state);
BUG(); BUG();
} }
@ -616,8 +616,8 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command,
default: default:
exec_cmd = 0; exec_cmd = 0;
printk(KERN_ERR "pxa3xx-nand: non-supported" dev_err(&info->pdev->dev, "non-supported command %x\n",
" command %x\n", command); command);
break; break;
} }
@ -646,7 +646,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
ret = wait_for_completion_timeout(&info->cmd_complete, ret = wait_for_completion_timeout(&info->cmd_complete,
CHIP_DELAY_TIMEOUT); CHIP_DELAY_TIMEOUT);
if (!ret) { 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 */ /* Stop State Machine for next command cycle */
pxa3xx_nand_stop(info); 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; struct pxa3xx_nand_platform_data *pdata = pdev->dev.platform_data;
uint32_t ndcr = 0x0; /* enable all interrupts */ 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; 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; return -EINVAL;
}
/* calculate flash information */ /* calculate flash information */
info->cmdset = &default_cmdset; info->cmdset = &default_cmdset;
@ -898,7 +902,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
if (!ret) { if (!ret) {
kfree(mtd); kfree(mtd);
info->mtd = NULL; 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; return -EINVAL;
} }
@ -906,11 +910,12 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
chip->cmdfunc(mtd, NAND_CMD_READID, 0, 0); chip->cmdfunc(mtd, NAND_CMD_READID, 0, 0);
id = *((uint16_t *)(info->data_buff)); id = *((uint16_t *)(info->data_buff));
if (id != 0) 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 { else {
kfree(mtd); kfree(mtd);
info->mtd = NULL; 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; 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)) { if (i >= (ARRAY_SIZE(builtin_flash_types) + pdata->num_flash - 1)) {
kfree(mtd); kfree(mtd);
info->mtd = NULL; info->mtd = NULL;
printk(KERN_ERR "ERROR!! flash not defined!!!\n"); dev_err(&info->pdev->dev, "ERROR!! flash not defined!!!\n");
return -EINVAL; return -EINVAL;
} }