summaryrefslogtreecommitdiff
path: root/net/qrtr
diff options
context:
space:
mode:
Diffstat (limited to 'net/qrtr')
-rw-r--r--net/qrtr/af_qrtr.c4
-rw-r--r--net/qrtr/ns.c6
-rw-r--r--net/qrtr/tun.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c
index 70e7a210fd42..55fd2dd37588 100644
--- a/net/qrtr/af_qrtr.c
+++ b/net/qrtr/af_qrtr.c
@@ -271,7 +271,7 @@ static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_port,
mutex_lock(&node->qrtr_tx_lock);
flow = radix_tree_lookup(&node->qrtr_tx_flow, key);
if (!flow) {
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (flow) {
init_waitqueue_head(&flow->resume_tx);
if (radix_tree_insert(&node->qrtr_tx_flow, key, flow)) {
@@ -589,7 +589,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid)
if (!ep || !ep->xmit)
return -EINVAL;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 36b5c1990bf5..3203b2220860 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -78,7 +78,7 @@ static struct qrtr_node *node_get(unsigned int node_id)
return node;
/* If node didn't exist, allocate and insert it to the tree */
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
@@ -229,7 +229,7 @@ static struct qrtr_server *server_add(unsigned int service,
if (!service || !port)
return NULL;
- srv = kzalloc_obj(*srv, GFP_KERNEL);
+ srv = kzalloc_obj(*srv);
if (!srv)
return NULL;
@@ -534,7 +534,7 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from,
if (from->sq_node != qrtr_ns.local_node)
return -EINVAL;
- lookup = kzalloc_obj(*lookup, GFP_KERNEL);
+ lookup = kzalloc_obj(*lookup);
if (!lookup)
return -ENOMEM;
diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c
index 9ad17a773593..9726db31fc7e 100644
--- a/net/qrtr/tun.c
+++ b/net/qrtr/tun.c
@@ -33,7 +33,7 @@ static int qrtr_tun_open(struct inode *inode, struct file *filp)
struct qrtr_tun *tun;
int ret;
- tun = kzalloc_obj(*tun, GFP_KERNEL);
+ tun = kzalloc_obj(*tun);
if (!tun)
return -ENOMEM;