[PATCH 1/5] net/9p: Delete an error message for a failed memory allocation in five functions

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Tue, 15 Aug 2017 08:25:41 +0200

Omit an extra message 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>
---
 net/9p/client.c       | 7 ++-----
 net/9p/trans_fd.c     | 6 ++----
 net/9p/trans_rdma.c   | 6 ++----
 net/9p/trans_virtio.c | 1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/net/9p/client.c b/net/9p/client.c
index 4674235b0d9b..2273181e9ba9 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -160,11 +160,9 @@ static int parse_opts(char *opts, struct p9_client *clnt)
                return 0;
 
        tmp_options = kstrdup(opts, GFP_KERNEL);
-       if (!tmp_options) {
-               p9_debug(P9_DEBUG_ERROR,
-                        "failed to allocate copy of option string\n");
+       if (!tmp_options)
                return -ENOMEM;
-       }
+
        options = tmp_options;
 
        while ((p = strsep(&options, ",")) != NULL) {
@@ -277,7 +275,6 @@ p9_tag_alloc(struct p9_client *c, u16 tag, unsigned int 
max_size)
                                        sizeof(struct p9_req_t), GFP_ATOMIC);
 
                        if (!c->reqs[row]) {
-                               pr_err("Couldn't grow tag array\n");
                                spin_unlock_irqrestore(&c->lock, flags);
                                return ERR_PTR(-ENOMEM);
                        }
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index ddfa86648f95..3c272e5bc9ea 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -762,11 +762,9 @@ static int parse_opts(char *params, struct p9_fd_opts 
*opts)
                return 0;
 
        tmp_options = kstrdup(params, GFP_KERNEL);
-       if (!tmp_options) {
-               p9_debug(P9_DEBUG_ERROR,
-                        "failed to allocate copy of option string\n");
+       if (!tmp_options)
                return -ENOMEM;
-       }
+
        options = tmp_options;
 
        while ((p = strsep(&options, ",")) != NULL) {
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 6d8e3031978f..f98b6aae308b 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -205,11 +205,9 @@ static int parse_opts(char *params, struct p9_rdma_opts 
*opts)
                return 0;
 
        tmp_options = kstrdup(params, GFP_KERNEL);
-       if (!tmp_options) {
-               p9_debug(P9_DEBUG_ERROR,
-                        "failed to allocate copy of option string\n");
+       if (!tmp_options)
                return -ENOMEM;
-       }
+
        options = tmp_options;
 
        while ((p = strsep(&options, ",")) != NULL) {
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index f24b25c25106..8a2cf9748398 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -552,7 +552,6 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 
        chan = kmalloc(sizeof(struct virtio_chan), GFP_KERNEL);
        if (!chan) {
-               pr_err("Failed to allocate virtio 9P channel\n");
                err = -ENOMEM;
                goto fail;
        }
-- 
2.14.0