mtd: cfi: 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>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Huang Shijie <b32955@freescale.com>

5 files changed, 6 insertions, 20 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 7aa581f0ea4d..8cd5fb5ec0ef 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -435,10 +435,8 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
         int i;
 
         mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
-        if (!mtd) {
-                printk(KERN_ERR "Failed to allocate memory for MTD device\n");
+        if (!mtd)
                 return NULL;
-        }
         mtd->priv = map;
         mtd->type = MTD_NORFLASH;
 
@@ -564,10 +562,8 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
         mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
         mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                         * mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) {
-                printk(KERN_ERR "Failed to allocate memory for MTD erase region info\n");
+        if (!mtd->eraseregions)
                 goto setup_err;
-        }
 
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 unsigned long ernum, ersize;
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index b4e8832eb4fa..bbd4a19a2ec8 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -507,10 +507,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
         int i;
 
         mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
-        if (!mtd) {
-                printk(KERN_WARNING "Failed to allocate memory for MTD device\n");
+        if (!mtd)
                 return NULL;
-        }
         mtd->priv = map;
         mtd->type = MTD_NORFLASH;
 
@@ -661,10 +659,8 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
         mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
         mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                                     * mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) {
-                printk(KERN_WARNING "Failed to allocate memory for MTD erase region info\n");
+        if (!mtd->eraseregions)
                 goto setup_err;
-        }
 
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 unsigned long ernum, ersize;
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 096993f9711e..78d6dcaab5f4 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -176,7 +176,6 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         //printk(KERN_DEBUG "number of CFI chips: %d\n", cfi->numchips);
 
         if (!mtd) {
-                printk(KERN_ERR "Failed to allocate memory for MTD device\n");
                 kfree(cfi->cmdset_priv);
                 return NULL;
         }
@@ -189,7 +188,6 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                         * mtd->numeraseregions, GFP_KERNEL);
         if (!mtd->eraseregions) {
-                printk(KERN_ERR "Failed to allocate memory for MTD erase region info\n");
                 kfree(cfi->cmdset_priv);
                 kfree(mtd);
                 return NULL;
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index d25535279404..e8d0164498b0 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -168,10 +168,8 @@ static int __xipram cfi_chip_setup(struct map_info *map,
                 return 0;
 
         cfi->cfiq = kmalloc(sizeof(struct cfi_ident) + num_erase_regions * 4, GFP_KERNEL);
-        if (!cfi->cfiq) {
-                printk(KERN_WARNING "%s: kmalloc failed for CFI ident structure\n", map->name);
+        if (!cfi->cfiq)
                 return 0;
-        }
 
         memset(cfi->cfiq,0,sizeof(struct cfi_ident));
 
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index f992418f40a8..08049f6eea60 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -116,10 +116,8 @@ __xipram cfi_read_pri(struct map_info *map, __u16 adr, __u16 size, const char* n
         printk(KERN_INFO "%s Extended Query Table at 0x%4.4X\n", name, adr);
 
         extp = kmalloc(size, GFP_KERNEL);
-        if (!extp) {
-                printk(KERN_ERR "Failed to allocate memory\n");
+        if (!extp)
                 goto out;
-        }
 
 #ifdef CONFIG_MTD_XIP
         local_irq_disable();