[NET]: Conversions from kmalloc+memset to k(z|c)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
a0ee7c70b2
commit
0da974f4f3
@@ -116,11 +116,10 @@ struct irlap_cb *irlap_open(struct net_device *dev, struct qos_info *qos,
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
|
||||
|
||||
/* Initialize the irlap structure. */
|
||||
self = kmalloc(sizeof(struct irlap_cb), GFP_KERNEL);
|
||||
self = kzalloc(sizeof(struct irlap_cb), GFP_KERNEL);
|
||||
if (self == NULL)
|
||||
return NULL;
|
||||
|
||||
memset(self, 0, sizeof(struct irlap_cb));
|
||||
self->magic = LAP_MAGIC;
|
||||
|
||||
/* Make a binding between the layers */
|
||||
@@ -1222,7 +1221,7 @@ static int irlap_seq_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int rc = -ENOMEM;
|
||||
struct irlap_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
|
||||
struct irlap_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
|
||||
|
||||
if (!s)
|
||||
goto out;
|
||||
@@ -1238,7 +1237,6 @@ static int irlap_seq_open(struct inode *inode, struct file *file)
|
||||
|
||||
seq = file->private_data;
|
||||
seq->private = s;
|
||||
memset(s, 0, sizeof(*s));
|
||||
out:
|
||||
return rc;
|
||||
out_kfree:
|
||||
|
Reference in New Issue
Block a user