]> Pileus Git - ~andy/linux/commitdiff
mtd: lpc32xx_slc: Remove unnecessary OOM messages
authorJingoo Han <jg1.han@samsung.com>
Thu, 26 Dec 2013 03:18:56 +0000 (12:18 +0900)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 7 Jan 2014 18:07:00 +0000 (10:07 -0800)
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/lpc32xx_slc.c

index 5f2039446bf06c64de916071208cd4b184ea2252..53a6742e3da39a2e1e43be81cf11be943c07a886 100644 (file)
@@ -725,10 +725,8 @@ static struct lpc32xx_nand_cfg_slc *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 NAND config\n");
+       if (!ncfg)
                return NULL;
-       }
 
        of_property_read_u32(np, "nxp,wdr-clks", &ncfg->wdr_clks);
        of_property_read_u32(np, "nxp,wwidth", &ncfg->wwidth);
@@ -772,10 +770,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;
-       }
        host->io_base_dma = rc->start;
 
        host->io_base = devm_ioremap_resource(&pdev->dev, rc);
@@ -858,7 +854,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
        host->data_buf = devm_kzalloc(&pdev->dev, host->dma_buf_len,
                                      GFP_KERNEL);
        if (host->data_buf == NULL) {
-               dev_err(&pdev->dev, "Error allocating memory\n");
                res = -ENOMEM;
                goto err_exit2;
        }