Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49afa55b authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent beae22e6

net/caif/cfcnfg.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

net/caif/cfctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;