|
@@ -613,10 +613,8 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)
|
|
|
struct device_node *np = dev->of_node;
|
|
|
|
|
|
ncfg = devm_kzalloc(dev, sizeof(*ncfg), GFP_KERNEL);
|
|
|
- if (!ncfg) {
|
|
|
- dev_err(dev, "could not allocate memory for platform data\n");
|
|
|
+ if (!ncfg)
|
|
|
return NULL;
|
|
|
- }
|
|
|
|
|
|
of_property_read_u32(np, "nxp,tcea-delay", &ncfg->tcea_delay);
|
|
|
of_property_read_u32(np, "nxp,busy-delay", &ncfg->busy_delay);
|
|
@@ -652,10 +650,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
|
|
|
|
|
|
/* Allocate memory for the device structure (and zero it) */
|
|
|
host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
|
|
|
- if (!host) {
|
|
|
- dev_err(&pdev->dev, "failed to allocate device structure.\n");
|
|
|
+ if (!host)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
rc = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
host->io_base = devm_ioremap_resource(&pdev->dev, rc);
|
|
@@ -750,14 +746,12 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
|
|
|
|
|
|
host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL);
|
|
|
if (!host->dma_buf) {
|
|
|
- dev_err(&pdev->dev, "Error allocating dma_buf memory\n");
|
|
|
res = -ENOMEM;
|
|
|
goto err_exit3;
|
|
|
}
|
|
|
|
|
|
host->dummy_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL);
|
|
|
if (!host->dummy_buf) {
|
|
|
- dev_err(&pdev->dev, "Error allocating dummy_buf memory\n");
|
|
|
res = -ENOMEM;
|
|
|
goto err_exit3;
|
|
|
}
|