lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/caif: Use kzalloc

Browse Source 
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>
This commit is contained in:
Julia Lawall
2010-05-13 10:03:32 +00:00
committed by David S. Miller
parent beae22e6f3
commit 49afa55b5b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/caif/cfcnfg.c
View File

@@ -65,12 +65,11 @@ struct cfcnfg *cfcnfg_create(void)
struct cfcnfg *this; struct cfcnfg *this;
struct cfctrl_rsp *resp; struct cfctrl_rsp *resp;
/* Initiate this layer */ /* Initiate this layer */
this = kmalloc(sizeof(struct cfcnfg), GFP_ATOMIC); this = kzalloc(sizeof(struct cfcnfg), GFP_ATOMIC);
if (!this) { if (!this) {
pr_warning("CAIF: %s(): Out of memory\n", __func__); pr_warning("CAIF: %s(): Out of memory\n", __func__);
return NULL; return NULL;
} }
memset(this, 0, sizeof(struct cfcnfg));
this->mux = cfmuxl_create(); this->mux = cfmuxl_create();
if (!this->mux) if (!this->mux)
goto out_of_mem; goto out_of_mem;

3
net/caif/cfctrl.c
View File

@@ -284,12 +284,11 @@ int cfctrl_linkup_request(struct cflayer *layer,
__func__, param->linktype); __func__, param->linktype);
return -EINVAL; return -EINVAL;
} }
req = kmalloc(sizeof(*req), GFP_KERNEL); req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req) { if (!req) {
pr_warning("CAIF: %s(): Out of memory\n", __func__); pr_warning("CAIF: %s(): Out of memory\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
memset(req, 0, sizeof(*req));
req->client_layer = user_layer; req->client_layer = user_layer;
req->cmd = CFCTRL_CMD_LINK_SETUP; req->cmd = CFCTRL_CMD_LINK_SETUP;
req->param = *param; req->param = *param;