diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-12-25 22:18:24 -0500 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2014-01-07 13:06:58 -0500 |
commit | 3479c9dcefad0c88aa5e8b20c9462b6c170223bd (patch) | |
tree | 70d621595eade41d2a7d96eb423c9ce41af87137 | |
parent | 24e9971d3d938f49ea03e0c76649a62894175b3f (diff) |
mtd: lpc32xx_mlc: Remove unnecessary OOM messages
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>
-rw-r--r-- | drivers/mtd/nand/lpc32xx_mlc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c index 48be85039a89..687478c9f09c 100644 --- a/drivers/mtd/nand/lpc32xx_mlc.c +++ b/drivers/mtd/nand/lpc32xx_mlc.c | |||
@@ -613,10 +613,8 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev) | |||
613 | struct device_node *np = dev->of_node; | 613 | struct device_node *np = dev->of_node; |
614 | 614 | ||
615 | ncfg = devm_kzalloc(dev, sizeof(*ncfg), GFP_KERNEL); | 615 | ncfg = devm_kzalloc(dev, sizeof(*ncfg), GFP_KERNEL); |
616 | if (!ncfg) { | 616 | if (!ncfg) |
617 | dev_err(dev, "could not allocate memory for platform data\n"); | ||
618 | return NULL; | 617 | return NULL; |
619 | } | ||
620 | 618 | ||
621 | of_property_read_u32(np, "nxp,tcea-delay", &ncfg->tcea_delay); | 619 | of_property_read_u32(np, "nxp,tcea-delay", &ncfg->tcea_delay); |
622 | of_property_read_u32(np, "nxp,busy-delay", &ncfg->busy_delay); | 620 | of_property_read_u32(np, "nxp,busy-delay", &ncfg->busy_delay); |
@@ -652,10 +650,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) | |||
652 | 650 | ||
653 | /* Allocate memory for the device structure (and zero it) */ | 651 | /* Allocate memory for the device structure (and zero it) */ |
654 | host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); | 652 | host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); |
655 | if (!host) { | 653 | if (!host) |
656 | dev_err(&pdev->dev, "failed to allocate device structure.\n"); | ||
657 | return -ENOMEM; | 654 | return -ENOMEM; |
658 | } | ||
659 | 655 | ||
660 | rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 656 | rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
661 | host->io_base = devm_ioremap_resource(&pdev->dev, rc); | 657 | host->io_base = devm_ioremap_resource(&pdev->dev, rc); |
@@ -750,14 +746,12 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) | |||
750 | 746 | ||
751 | host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL); | 747 | host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL); |
752 | if (!host->dma_buf) { | 748 | if (!host->dma_buf) { |
753 | dev_err(&pdev->dev, "Error allocating dma_buf memory\n"); | ||
754 | res = -ENOMEM; | 749 | res = -ENOMEM; |
755 | goto err_exit3; | 750 | goto err_exit3; |
756 | } | 751 | } |
757 | 752 | ||
758 | host->dummy_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL); | 753 | host->dummy_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL); |
759 | if (!host->dummy_buf) { | 754 | if (!host->dummy_buf) { |
760 | dev_err(&pdev->dev, "Error allocating dummy_buf memory\n"); | ||
761 | res = -ENOMEM; | 755 | res = -ENOMEM; |
762 | goto err_exit3; | 756 | goto err_exit3; |
763 | } | 757 | } |