[PATCH 1/3] pcmcia/cistpl: Delete error messages for a failed memory allocation in three functions

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Thu, 28 Dec 2017 22:12:00 +0100

Omit extra messages for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/pcmcia/cistpl.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 102646fedb56..192c0e8e9c3d 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -379,10 +379,9 @@ int verify_cis_cache(struct pcmcia_socket *s)
                return -EINVAL;
 
        buf = kmalloc(256, GFP_KERNEL);
-       if (buf == NULL) {
-               dev_warn(&s->dev, "no memory for verifying CIS\n");
+       if (!buf)
                return -ENOMEM;
-       }
+
        mutex_lock(&s->ops_mutex);
        list_for_each_entry(cis, &s->cis_cache, node) {
                int len = cis->len;
@@ -419,7 +418,6 @@ int pcmcia_replace_cis(struct pcmcia_socket *s,
        kfree(s->fake_cis);
        s->fake_cis = kmalloc(len, GFP_KERNEL);
        if (s->fake_cis == NULL) {
-               dev_warn(&s->dev, "no memory to replace CIS\n");
                mutex_unlock(&s->ops_mutex);
                return -ENOMEM;
        }
@@ -1395,14 +1393,12 @@ int pccard_validate_cis(struct pcmcia_socket *s, 
unsigned int *info)
        mutex_unlock(&s->ops_mutex);
 
        tuple = kmalloc(sizeof(*tuple), GFP_KERNEL);
-       if (tuple == NULL) {
-               dev_warn(&s->dev, "no memory to validate CIS\n");
+       if (!tuple)
                return -ENOMEM;
-       }
+
        p = kmalloc(sizeof(*p), GFP_KERNEL);
        if (p == NULL) {
                kfree(tuple);
-               dev_warn(&s->dev, "no memory to validate CIS\n");
                return -ENOMEM;
        }
 
-- 
2.15.1


_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia