diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-12-25 22:16:38 -0500 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2014-01-07 13:06:46 -0500 |
commit | d9a21ae8e5f3fe2d940f54e45386b35b98cbcc35 (patch) | |
tree | cb251b32ff7ec9856a8d2c3a6b378e4d4eff00a3 /drivers/mtd/nand | |
parent | 006692319bf0362f053a9e8a56a1416611aaa116 (diff) |
mtd: fsmc_nand: 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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/fsmc_nand.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index 8b2752263db9..a5915f1172e6 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c | |||
@@ -889,10 +889,8 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev, | |||
889 | 889 | ||
890 | pdata->nand_timings = devm_kzalloc(&pdev->dev, | 890 | pdata->nand_timings = devm_kzalloc(&pdev->dev, |
891 | sizeof(*pdata->nand_timings), GFP_KERNEL); | 891 | sizeof(*pdata->nand_timings), GFP_KERNEL); |
892 | if (!pdata->nand_timings) { | 892 | if (!pdata->nand_timings) |
893 | dev_err(&pdev->dev, "no memory for nand_timing\n"); | ||
894 | return -ENOMEM; | 893 | return -ENOMEM; |
895 | } | ||
896 | of_property_read_u8_array(np, "timings", (u8 *)pdata->nand_timings, | 894 | of_property_read_u8_array(np, "timings", (u8 *)pdata->nand_timings, |
897 | sizeof(*pdata->nand_timings)); | 895 | sizeof(*pdata->nand_timings)); |
898 | 896 | ||
@@ -950,10 +948,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) | |||
950 | 948 | ||
951 | /* Allocate memory for the device structure (and zero it) */ | 949 | /* Allocate memory for the device structure (and zero it) */ |
952 | host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); | 950 | host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); |
953 | if (!host) { | 951 | if (!host) |
954 | dev_err(&pdev->dev, "failed to allocate device structure\n"); | ||
955 | return -ENOMEM; | 952 | return -ENOMEM; |
956 | } | ||
957 | 953 | ||
958 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data"); | 954 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data"); |
959 | host->data_va = devm_ioremap_resource(&pdev->dev, res); | 955 | host->data_va = devm_ioremap_resource(&pdev->dev, res); |