mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

ASoC: SOF: Remove strsplit_u32() and tokenize_input()

Browse source 
Make use of global integer-array parsing helper instead of the internal
one as both serve same purpose. With that, both strsplit_u32() and
tokenize_input() become unused so remove them.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220904102840.862395-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cezary Rojewski 2022-09-04 12:28:40 +02:00 committed by Mark Brown
parent f0b933236e
commit b9163e9b5f
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 15 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
sound/soc/sof/sof-client-probes.c
View file

@ -12,6 +12,8 @@
#include <linux/debugfs.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
#include <linux/string_helpers.h>
#include <sound/soc.h>
#include <sound/sof/header.h>
#include "sof-client.h"
@ -410,79 +412,6 @@ static const struct snd_compress_ops sof_probes_compressed_ops = {
.copy = sof_probes_compr_copy,
};
/**
* strsplit_u32 - Split string into sequence of u32 tokens
* @buf: String to split into tokens.
* @delim: String containing delimiter characters.
* @tkns: Returned u32 sequence pointer.
* @num_tkns: Returned number of tokens obtained.
*/
static int strsplit_u32(char *buf, const char *delim, u32 **tkns, size_t *num_tkns)
{
char *s;
u32 *data, *tmp;
size_t count = 0;
size_t cap = 32;
int ret = 0;
*tkns = NULL;
*num_tkns = 0;
data = kcalloc(cap, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
while ((s = strsep(&buf, delim)) != NULL) {
ret = kstrtouint(s, 0, data + count);
if (ret)
goto exit;
if (++count >= cap) {
cap *= 2;
tmp = krealloc(data, cap * sizeof(*data), GFP_KERNEL);
if (!tmp) {
ret = -ENOMEM;
goto exit;
}
data = tmp;
}
}
if (!count)
goto exit;
*tkns = kmemdup(data, count * sizeof(*data), GFP_KERNEL);
if (!(*tkns)) {
ret = -ENOMEM;
goto exit;
}
*num_tkns = count;
exit:
kfree(data);
return ret;
}
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)
{
@ -548,8 +477,8 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
struct sof_probes_priv *priv = cdev->data;
struct device *dev = &cdev->auxdev.dev;
struct sof_probe_point_desc *desc;
size_t num_tkns, bytes;
u32 *tkns;
u32 num_elems, *array;
size_t bytes;
int ret, err;
if (priv->extractor_stream_tag == SOF_PROBES_INVALID_NODE_ID) {
@ -557,16 +486,18 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
return -ENOENT;
}
ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
ret = parse_int_array_user(from, count, (int **)&array);
if (ret < 0)
return ret;
bytes = sizeof(*tkns) * num_tkns;
if (!num_tkns || (bytes % sizeof(*desc))) {
num_elems = *array;
bytes = sizeof(*array) * num_elems;
if (bytes % sizeof(*desc)) {
ret = -EINVAL;
goto exit;
}
desc = (struct sof_probe_point_desc *)tkns;
desc = (struct sof_probe_point_desc *)&array[1];
ret = pm_runtime_resume_and_get(dev);
if (ret < 0 && ret != -EACCES) {
@ -583,7 +514,7 @@ sof_probes_dfs_points_write(struct file *file, const char __user *from,
if (err < 0)
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
exit:
kfree(tkns);
kfree(array);
return ret;
}
@ -603,22 +534,17 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
struct sof_client_dev *cdev = file->private_data;
struct sof_probes_priv *priv = cdev->data;
struct device *dev = &cdev->auxdev.dev;
size_t num_tkns;
u32 *tkns;
int ret, err;
u32 *array;
if (priv->extractor_stream_tag == SOF_PROBES_INVALID_NODE_ID) {
dev_warn(dev, "no extractor stream running\n");
return -ENOENT;
}
ret = tokenize_input(from, count, ppos, &tkns, &num_tkns);
ret = parse_int_array_user(from, count, (int **)&array);
if (ret < 0)
return ret;
if (!num_tkns) {
ret = -EINVAL;
goto exit;
}
ret = pm_runtime_resume_and_get(dev);
if (ret < 0) {
@ -626,7 +552,7 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
goto exit;
}
ret = sof_probes_points_remove(cdev, tkns, num_tkns);
ret = sof_probes_points_remove(cdev, &array[1], array[0]);
if (!ret)
ret = count;
@ -635,7 +561,7 @@ sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
if (err < 0)
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
exit:
kfree(tkns);
kfree(array);
return ret;
}