net/caif: Use kzalloc

Use kzalloc rather than the combination of kmalloc and memset.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c
index 471c62939fad83a05a42ab0229be4bcca1a17783..df43f264d9fbac36633934b0081c239ab7830c3d 100644 (file)
--- a/net/caif/cfcnfg.c
+++ b/net/caif/cfcnfg.c
@@ -65,12 +65,11 @@ struct cfcnfg *cfcnfg_create(void)
        struct cfcnfg *this;
        struct cfctrl_rsp *resp;
        /* Initiate this layer */
-       this = kmalloc(sizeof(struct cfcnfg), GFP_ATOMIC);
+       this = kzalloc(sizeof(struct cfcnfg), GFP_ATOMIC);
        if (!this) {
                pr_warning("CAIF: %s(): Out of memory\n", __func__);
                return NULL;
        }
-       memset(this, 0, sizeof(struct cfcnfg));
        this->mux = cfmuxl_create();
        if (!this->mux)
                goto out_of_mem;

diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index a521d32cfe56beff3975264088d0f6b9d15f7ee5..0ffe1e1ce90164ba9acfa780a3769c4c967f2d48 100644 (file)
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -284,12 +284,11 @@ int cfctrl_linkup_request(struct cflayer *layer,
                           __func__, param->linktype);
                return -EINVAL;
        }
-       req = kmalloc(sizeof(*req), GFP_KERNEL);
+       req = kzalloc(sizeof(*req), GFP_KERNEL);
        if (!req) {
                pr_warning("CAIF: %s(): Out of memory\n", __func__);
                return -ENOMEM;
        }
-       memset(req, 0, sizeof(*req));
        req->client_layer = user_layer;
        req->cmd = CFCTRL_CMD_LINK_SETUP;
        req->param = *param;