leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/arm/mach-omap2: replace strict_strto* with kstrto*

Browse Source 
Replace obsolete strict_strto call with kstrto calls.
Simplify copy_from_user/strict_strto by using kstrto_from_user

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daniel Walter
2014-08-08 14:23:52 -07:00
committed by Linus Torvalds
parent f9213e78c4
commit 056610ac14
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-omap3touchbook.c
View File

@@ -336,7 +336,7 @@ static int __init early_touchbook_revision(char *p)
if (!p) if (!p)
return 0; return 0;
return strict_strtoul(p, 10, &touchbook_revision); return kstrtoul(p, 10, &touchbook_revision);
} }
early_param("tbr", early_touchbook_revision); early_param("tbr", early_touchbook_revision);

22
arch/arm/mach-omap2/mux.c
View File

@@ -681,29 +681,19 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,
const char __user *user_buf, const char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
char buf[OMAP_MUX_MAX_ARG_CHAR];
struct seq_file *seqf; struct seq_file *seqf;
struct omap_mux *m; struct omap_mux *m;
unsigned long val; u16 val;
int buf_size, ret; int ret;
struct omap_mux_partition *partition; struct omap_mux_partition *partition;
if (count > OMAP_MUX_MAX_ARG_CHAR) if (count > OMAP_MUX_MAX_ARG_CHAR)
return -EINVAL; return -EINVAL;
memset(buf, 0, sizeof(buf)); ret = kstrtou16_from_user(user_buf, count, 0x10, &val);
buf_size = min(count, sizeof(buf) - 1);
if (copy_from_user(buf, user_buf, buf_size))
return -EFAULT;
ret = strict_strtoul(buf, 0x10, &val);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (val > 0xffff)
return -EINVAL;
seqf = file->private_data; seqf = file->private_data;
m = seqf->private; m = seqf->private;
@@ -711,7 +701,7 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,
if (!partition) if (!partition)
return -ENODEV; return -ENODEV;
omap_mux_write(partition, (u16)val, m->reg_offset); omap_mux_write(partition, val, m->reg_offset);
*ppos += count; *ppos += count;
return count; return count;
@@ -917,14 +907,14 @@ static void __init omap_mux_set_cmdline_signals(void)
while ((token = strsep(&next_opt, ",")) != NULL) { while ((token = strsep(&next_opt, ",")) != NULL) {
char *keyval, *name; char *keyval, *name;
unsigned long val; u16 val;
keyval = token; keyval = token;
name = strsep(&keyval, "="); name = strsep(&keyval, "=");
if (name) { if (name) {
int res; int res;
res = strict_strtoul(keyval, 0x10, &val); res = kstrtou16(keyval, 0x10, &val);
if (res < 0) if (res < 0)
continue; continue;