diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-13 06:03:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-18 01:55:09 -0400 |
commit | 49afa55b5bd792cda4fca15d3238e9b6f370c856 (patch) | |
tree | 23db397198f666c7729592ec494cb2170ca95e8e /net | |
parent | beae22e6f393c461ee7fb394dbf06fa50157836b (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/caif/cfcnfg.c | 3 | ||||
-rw-r--r-- | net/caif/cfctrl.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index 471c62939fad..df43f264d9fb 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c | |||
@@ -65,12 +65,11 @@ struct cfcnfg *cfcnfg_create(void) | |||
65 | struct cfcnfg *this; | 65 | struct cfcnfg *this; |
66 | struct cfctrl_rsp *resp; | 66 | struct cfctrl_rsp *resp; |
67 | /* Initiate this layer */ | 67 | /* Initiate this layer */ |
68 | this = kmalloc(sizeof(struct cfcnfg), GFP_ATOMIC); | 68 | this = kzalloc(sizeof(struct cfcnfg), GFP_ATOMIC); |
69 | if (!this) { | 69 | if (!this) { |
70 | pr_warning("CAIF: %s(): Out of memory\n", __func__); | 70 | pr_warning("CAIF: %s(): Out of memory\n", __func__); |
71 | return NULL; | 71 | return NULL; |
72 | } | 72 | } |
73 | memset(this, 0, sizeof(struct cfcnfg)); | ||
74 | this->mux = cfmuxl_create(); | 73 | this->mux = cfmuxl_create(); |
75 | if (!this->mux) | 74 | if (!this->mux) |
76 | goto out_of_mem; | 75 | goto out_of_mem; |
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c index a521d32cfe56..0ffe1e1ce901 100644 --- a/net/caif/cfctrl.c +++ b/net/caif/cfctrl.c | |||
@@ -284,12 +284,11 @@ int cfctrl_linkup_request(struct cflayer *layer, | |||
284 | __func__, param->linktype); | 284 | __func__, param->linktype); |
285 | return -EINVAL; | 285 | return -EINVAL; |
286 | } | 286 | } |
287 | req = kmalloc(sizeof(*req), GFP_KERNEL); | 287 | req = kzalloc(sizeof(*req), GFP_KERNEL); |
288 | if (!req) { | 288 | if (!req) { |
289 | pr_warning("CAIF: %s(): Out of memory\n", __func__); | 289 | pr_warning("CAIF: %s(): Out of memory\n", __func__); |
290 | return -ENOMEM; | 290 | return -ENOMEM; |
291 | } | 291 | } |
292 | memset(req, 0, sizeof(*req)); | ||
293 | req->client_layer = user_layer; | 292 | req->client_layer = user_layer; |
294 | req->cmd = CFCTRL_CMD_LINK_SETUP; | 293 | req->cmd = CFCTRL_CMD_LINK_SETUP; |
295 | req->param = *param; | 294 | req->param = *param; |