From: Cezary Rojewski <cezary.rojewski@intel.com> To: andy@kernel.org, broonie@kernel.org Cc: alsa-devel@alsa-project.org, tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com, Cezary Rojewski <cezary.rojewski@intel.com> Subject: [PATCH 2/2] ASoC: SOF: Remove tokenize_input() Date: Thu, 7 Jul 2022 11:13:01 +0200 [thread overview] Message-ID: <20220707091301.1282291-2-cezary.rojewski@intel.com> (raw) In-Reply-To: <20220707091301.1282291-1-cezary.rojewski@intel.com> 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 <cezary.rojewski@intel.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Cezary Rojewski <cezary.rojewski@intel.com> To: andy@kernel.org, broonie@kernel.org Cc: alsa-devel@alsa-project.org, kai.vehmanen@linux.intel.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>, pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, yung-chuan.liao@linux.intel.com, ranjani.sridharan@linux.intel.com, amadeuszx.slawinski@linux.intel.com, peter.ujfalusi@linux.intel.com Subject: [PATCH 2/2] ASoC: SOF: Remove tokenize_input() Date: Thu, 7 Jul 2022 11:13:01 +0200 [thread overview] Message-ID: <20220707091301.1282291-2-cezary.rojewski@intel.com> (raw) In-Reply-To: <20220707091301.1282291-1-cezary.rojewski@intel.com> 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 <cezary.rojewski@intel.com> --- 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
next prev parent reply other threads:[~2022-07-07 9:03 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-07 9:13 [PATCH 1/2] lib/string_helpers: Introduce strsplit_u32() Cezary Rojewski 2022-07-07 9:13 ` Cezary Rojewski 2022-07-07 9:13 ` Cezary Rojewski [this message] 2022-07-07 9:13 ` [PATCH 2/2] ASoC: SOF: Remove tokenize_input() Cezary Rojewski 2022-07-07 13:51 ` [PATCH 1/2] lib/string_helpers: Introduce strsplit_u32() Péter Ujfalusi 2022-07-07 13:51 ` Péter Ujfalusi 2022-07-08 11:33 ` Cezary Rojewski 2022-07-08 11:33 ` Cezary Rojewski 2022-07-08 10:22 ` Andy Shevchenko 2022-07-08 10:22 ` Andy Shevchenko 2022-07-08 11:29 ` Andy Shevchenko 2022-07-08 11:29 ` Andy Shevchenko 2022-07-08 11:32 ` Cezary Rojewski 2022-07-08 11:32 ` Cezary Rojewski 2022-07-08 11:46 ` Andy Shevchenko 2022-07-08 11:46 ` Andy Shevchenko 2022-07-08 11:51 ` Andy Shevchenko 2022-07-08 11:51 ` Andy Shevchenko 2022-07-08 12:13 ` Cezary Rojewski 2022-07-08 12:13 ` Cezary Rojewski 2022-07-08 12:30 ` Andy Shevchenko 2022-07-08 12:30 ` Andy Shevchenko 2022-07-08 12:35 ` Péter Ujfalusi 2022-07-08 12:35 ` Péter Ujfalusi 2022-07-08 15:25 ` Andy Shevchenko 2022-07-08 15:25 ` Andy Shevchenko 2022-07-08 15:28 ` Andy Shevchenko 2022-07-08 15:28 ` Andy Shevchenko 2022-07-08 16:32 ` Cezary Rojewski 2022-07-08 16:32 ` Cezary Rojewski 2022-07-08 16:49 ` Andy Shevchenko 2022-07-08 16:49 ` Andy Shevchenko 2022-07-09 8:45 ` Cezary Rojewski 2022-07-09 8:45 ` Cezary Rojewski 2022-07-09 20:42 ` Andy Shevchenko 2022-07-09 20:42 ` Andy Shevchenko 2022-07-12 13:51 ` Cezary Rojewski 2022-07-12 13:51 ` Cezary Rojewski 2022-07-12 13:59 ` Andy Shevchenko 2022-07-12 13:59 ` Andy Shevchenko 2022-07-12 14:02 ` Mark Brown 2022-07-12 14:02 ` Mark Brown 2022-07-12 14:24 ` Andy Shevchenko 2022-07-12 14:24 ` Andy Shevchenko 2022-07-19 11:40 ` Cezary Rojewski 2022-07-19 11:40 ` Cezary Rojewski 2022-08-09 9:55 ` Cezary Rojewski 2022-08-09 9:55 ` Cezary Rojewski 2022-08-09 15:23 ` Andy Shevchenko 2022-08-09 15:23 ` Andy Shevchenko 2022-08-16 9:28 ` Cezary Rojewski 2022-08-16 9:28 ` Cezary Rojewski 2022-08-25 15:09 ` Andy Shevchenko 2022-08-25 15:09 ` Andy Shevchenko 2022-08-25 16:44 ` Cezary Rojewski 2022-08-25 16:44 ` Cezary Rojewski 2022-07-13 9:14 ` David Laight 2022-07-13 9:14 ` David Laight 2022-07-13 9:38 ` Andy Shevchenko 2022-07-13 9:38 ` Andy Shevchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220707091301.1282291-2-cezary.rojewski@intel.com \ --to=cezary.rojewski@intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=amadeuszx.slawinski@linux.intel.com \ --cc=andy@kernel.org \ --cc=broonie@kernel.org \ --cc=hdegoede@redhat.com \ --cc=kai.vehmanen@linux.intel.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=peter.ujfalusi@linux.intel.com \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=ranjani.sridharan@linux.intel.com \ --cc=tiwai@suse.com \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.