提交 b785a492 编写于 作者: J Jingoo Han 提交者: Takashi Iwai

ALSA: replace strict_strto*() with kstrto*()

The usage of strict_strto*() is not preferred, because
strict_strto*() is obsolete. Thus, kstrto*() should be
used.
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 60ea8ca2
...@@ -1022,7 +1022,7 @@ static void dummy_proc_write(struct snd_info_entry *entry, ...@@ -1022,7 +1022,7 @@ static void dummy_proc_write(struct snd_info_entry *entry,
if (i >= ARRAY_SIZE(fields)) if (i >= ARRAY_SIZE(fields))
continue; continue;
snd_info_get_str(item, ptr, sizeof(item)); snd_info_get_str(item, ptr, sizeof(item));
if (strict_strtoull(item, 0, &val)) if (kstrtoull(item, 0, &val))
continue; continue;
if (fields[i].size == sizeof(int)) if (fields[i].size == sizeof(int))
*get_dummy_int_ptr(dummy, fields[i].offset) = val; *get_dummy_int_ptr(dummy, fields[i].offset) = val;
......
...@@ -295,7 +295,7 @@ static ssize_t type##_store(struct device *dev, \ ...@@ -295,7 +295,7 @@ static ssize_t type##_store(struct device *dev, \
struct snd_hwdep *hwdep = dev_get_drvdata(dev); \ struct snd_hwdep *hwdep = dev_get_drvdata(dev); \
struct hda_codec *codec = hwdep->private_data; \ struct hda_codec *codec = hwdep->private_data; \
unsigned long val; \ unsigned long val; \
int err = strict_strtoul(buf, 0, &val); \ int err = kstrtoul(buf, 0, &val); \
if (err < 0) \ if (err < 0) \
return err; \ return err; \
codec->type = val; \ codec->type = val; \
...@@ -654,7 +654,7 @@ int snd_hda_get_int_hint(struct hda_codec *codec, const char *key, int *valp) ...@@ -654,7 +654,7 @@ int snd_hda_get_int_hint(struct hda_codec *codec, const char *key, int *valp)
p = snd_hda_get_hint(codec, key); p = snd_hda_get_hint(codec, key);
if (!p) if (!p)
ret = -ENOENT; ret = -ENOENT;
else if (strict_strtoul(p, 0, &val)) else if (kstrtoul(p, 0, &val))
ret = -EINVAL; ret = -EINVAL;
else { else {
*valp = val; *valp = val;
...@@ -751,7 +751,7 @@ static void parse_##name##_mode(char *buf, struct hda_bus *bus, \ ...@@ -751,7 +751,7 @@ static void parse_##name##_mode(char *buf, struct hda_bus *bus, \
struct hda_codec **codecp) \ struct hda_codec **codecp) \
{ \ { \
unsigned long val; \ unsigned long val; \
if (!strict_strtoul(buf, 0, &val)) \ if (!kstrtoul(buf, 0, &val)) \
(*codecp)->name = val; \ (*codecp)->name = val; \
} }
......
...@@ -3175,7 +3175,7 @@ static ssize_t wm8962_beep_set(struct device *dev, ...@@ -3175,7 +3175,7 @@ static ssize_t wm8962_beep_set(struct device *dev,
long int time; long int time;
int ret; int ret;
ret = strict_strtol(buf, 10, &time); ret = kstrtol(buf, 10, &time);
if (ret != 0) if (ret != 0)
return ret; return ret;
......
...@@ -781,7 +781,7 @@ static ssize_t prop##_store(struct device *dev, \ ...@@ -781,7 +781,7 @@ static ssize_t prop##_store(struct device *dev, \
unsigned long val; \ unsigned long val; \
int status; \ int status; \
\ \
status = strict_strtoul(buf, 0, &val); \ status = kstrtoul(buf, 0, &val); \
if (status) \ if (status) \
return status; \ return status; \
\ \
......
...@@ -192,7 +192,7 @@ static ssize_t pmdown_time_set(struct device *dev, ...@@ -192,7 +192,7 @@ static ssize_t pmdown_time_set(struct device *dev,
struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev); struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
int ret; int ret;
ret = strict_strtol(buf, 10, &rtd->pmdown_time); ret = kstrtol(buf, 10, &rtd->pmdown_time);
if (ret) if (ret)
return ret; return ret;
...@@ -237,6 +237,7 @@ static ssize_t codec_reg_write_file(struct file *file, ...@@ -237,6 +237,7 @@ static ssize_t codec_reg_write_file(struct file *file,
char *start = buf; char *start = buf;
unsigned long reg, value; unsigned long reg, value;
struct snd_soc_codec *codec = file->private_data; struct snd_soc_codec *codec = file->private_data;
int ret;
buf_size = min(count, (sizeof(buf)-1)); buf_size = min(count, (sizeof(buf)-1));
if (copy_from_user(buf, user_buf, buf_size)) if (copy_from_user(buf, user_buf, buf_size))
...@@ -248,8 +249,9 @@ static ssize_t codec_reg_write_file(struct file *file, ...@@ -248,8 +249,9 @@ static ssize_t codec_reg_write_file(struct file *file,
reg = simple_strtoul(start, &start, 16); reg = simple_strtoul(start, &start, 16);
while (*start == ' ') while (*start == ' ')
start++; start++;
if (strict_strtoul(start, 16, &value)) ret = kstrtoul(start, 16, &value);
return -EINVAL; if (ret)
return ret;
/* Userspace has been fiddling around behind the kernel's back */ /* Userspace has been fiddling around behind the kernel's back */
add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_USER, LOCKDEP_NOW_UNRELIABLE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册