summaryrefslogtreecommitdiff
path: root/drivers/hsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hsi')
-rw-r--r--drivers/hsi/clients/cmt_speech.c4
-rw-r--r--drivers/hsi/clients/hsi_char.c2
-rw-r--r--drivers/hsi/clients/ssi_protocol.c4
-rw-r--r--drivers/hsi/hsi_boardinfo.c2
-rw-r--r--drivers/hsi/hsi_core.c8
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 5918401a4db9..d5aa87833768 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -273,7 +273,7 @@ static int cs_alloc_cmds(struct cs_hsi_iface *hi)
msg = hsi_alloc_msg(1, GFP_KERNEL);
if (!msg)
goto out;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf) {
hsi_free_msg(msg);
goto out;
@@ -985,7 +985,7 @@ static int cs_hsi_start(struct cs_hsi_iface **hi, struct hsi_client *cl,
unsigned long mmap_base, unsigned long mmap_size)
{
int err = 0;
- struct cs_hsi_iface *hsi_if = kzalloc_obj(*hsi_if, GFP_KERNEL);
+ struct cs_hsi_iface *hsi_if = kzalloc_obj(*hsi_if);
dev_dbg(&cl->device, "cs_hsi_start\n");
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c
index 3258a7cf81ac..a31cc1466dd3 100644
--- a/drivers/hsi/clients/hsi_char.c
+++ b/drivers/hsi/clients/hsi_char.c
@@ -683,7 +683,7 @@ static int hsc_probe(struct device *dev)
int ret;
int i;
- cl_data = kzalloc_obj(*cl_data, GFP_KERNEL);
+ cl_data = kzalloc_obj(*cl_data);
if (!cl_data)
return -ENOMEM;
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index e7bb2803ace5..7c6ca8391a6b 100644
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -259,7 +259,7 @@ static int ssip_alloc_cmds(struct ssi_protocol *ssi)
msg = hsi_alloc_msg(1, GFP_KERNEL);
if (!msg)
goto out;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf) {
hsi_free_msg(msg);
goto out;
@@ -1077,7 +1077,7 @@ static int ssi_protocol_probe(struct device *dev)
struct ssi_protocol *ssi;
int err;
- ssi = kzalloc_obj(*ssi, GFP_KERNEL);
+ ssi = kzalloc_obj(*ssi);
if (!ssi)
return -ENOMEM;
diff --git a/drivers/hsi/hsi_boardinfo.c b/drivers/hsi/hsi_boardinfo.c
index 109b0fb71a9a..8c79e4062798 100644
--- a/drivers/hsi/hsi_boardinfo.c
+++ b/drivers/hsi/hsi_boardinfo.c
@@ -36,7 +36,7 @@ int __init hsi_register_board_info(struct hsi_board_info const *info,
{
struct hsi_cl_info *cl_info;
- cl_info = kzalloc_objs(*cl_info, len, GFP_KERNEL);
+ cl_info = kzalloc_objs(*cl_info, len);
if (!cl_info)
return -ENOMEM;
diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c
index 84792da4caca..7cb2dcb30fdb 100644
--- a/drivers/hsi/hsi_core.c
+++ b/drivers/hsi/hsi_core.c
@@ -70,7 +70,7 @@ struct hsi_client *hsi_new_client(struct hsi_port *port,
struct hsi_client *cl;
size_t size;
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
goto err;
@@ -203,7 +203,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
char name[32];
int length, cells, err, i, max_chan, mode;
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return;
@@ -253,13 +253,13 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
cl->rx_cfg.num_channels = cells;
cl->tx_cfg.num_channels = cells;
- cl->rx_cfg.channels = kzalloc_objs(channel, cells, GFP_KERNEL);
+ cl->rx_cfg.channels = kzalloc_objs(channel, cells);
if (!cl->rx_cfg.channels) {
err = -ENOMEM;
goto err;
}
- cl->tx_cfg.channels = kzalloc_objs(channel, cells, GFP_KERNEL);
+ cl->tx_cfg.channels = kzalloc_objs(channel, cells);
if (!cl->tx_cfg.channels) {
err = -ENOMEM;
goto err2;