2022-07-07 09:43:38

by Cezary Rojewski

[permalink] [raw]
Subject: [PATCH 2/2] ASoC: SOF: Remove tokenize_input()

Now that we have strsplit_u32_user() tokenize_input() is needed no
longer. Remove it and update all occurrences of its usage.

Signed-off-by: Cezary Rojewski <[email protected]>
---
sound/soc/sof/sof-client-probes.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c
index 48ebbe58e2b9..7a79a529e2b7 100644
--- a/sound/soc/sof/sof-client-probes.c
+++ b/sound/soc/sof/sof-client-probes.c
@@ -411,29 +411,6 @@ static const struct snd_compress_ops sof_probes_compressed_ops = {
.copy = sof_probes_compr_copy,
};

-static int tokenize_input(const char __user *from, size_t count,
- loff_t *ppos, u32 **tkns, size_t *num_tkns)
-{
- char *buf;
- int ret;
-
- buf = kmalloc(count + 1, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
-
- ret = simple_write_to_buffer(buf, count, ppos, from, count);
- if (ret != count) {
- ret = ret >= 0 ? -EIO : ret;
- goto exit;
- }
-
- buf[count] = '\0';
- ret = strsplit_u32(buf, ",", tkns, num_tkns);
-exit:
- kfree(buf);
- return ret;
-}
-
static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
size_t count, loff_t *ppos)
{
@@ -508,7 +485,7 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
return -ENOENT;
}

- ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
+ ret = strsplit_u32_user(from, count, ppos, ",", &tkns, &num_tkns);
if (ret < 0)
return ret;
bytes = sizeof(*tkns) * num_tkns;
@@ -563,7 +540,7 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
return -ENOENT;
}

- ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
+ ret = strsplit_u32_user(from, count, ppos, ",", &tkns, &num_tkns);
if (ret < 0)
return ret;
if (!num_tkns) {
--
2.25.1