replace strict_strto* with kstrto*
Subsystems (3)
PATCH 1/9 replace strict_strto* with kstrto*
Replace obsolete strict_strto call with kstrto calls. Simplify copy_from_user/strict_strto by using kstrto_from_user
Signed-off-by Daniel Walter <[email protected]>
--- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/mux.c | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-)
arch/arm/mach-omap2/board-omap3touchbook.c +1 -1
@@ -336,7 +336,7 @@ static int __init early_touchbook_revision(char *p)if (!p)return 0 ; -return strict_strtoul (p,10 , &touchbook_revision); +return kstrtoul (p,10 , &touchbook_revision); }early_param ("tbr" , early_touchbook_revision);
arch/arm/mach-omap2/mux.c +6 -16
@@ -679,29 +679,19 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,const char __user *user_buf, size_t count, loff_t *ppos) { - char buf[OMAP_MUX_MAX_ARG_CHAR]; struct seq_file *seqf;struct omap_mux *m; -unsigned long val; -int buf_size, ret; +u16 val; +int ret;struct omap_mux_partition *partition;if (count >OMAP_MUX_MAX_ARG_CHAR )return -EINVAL ; -memset (buf,0 ,sizeof (buf)); - buf_size =min (count,sizeof (buf) -1 ); - -if (copy_from_user (buf, user_buf, buf_size)) -return -EFAULT ; - - ret =strict_strtoul (buf,0x10 , &val); + ret =kstrtou16_from_user (user_buf, count,0x10 , &val);if (ret <0 )return ret; -if (val >0xffff ) -return -EINVAL ; - seqf = file->private_data; m = seqf->private;
@@ -709,7 +699,7 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,if (!partition)return -ENODEV ; -omap_mux_write (partition, (u16 )val, m->reg_offset); +omap_mux_write (partition, val, m->reg_offset); *ppos += count;return count;
@@ -915,14 +905,14 @@ static void __init omap_mux_set_cmdline_signals(void)while ((token =strsep (&next_opt,"," )) !=NULL ) {char *keyval, *name; -unsigned long val; +u16 val; keyval = token; name =strsep (&keyval,"=" );if (name) {int res; - res =strict_strtoul (keyval,0x10 , &val); + res =kstrtou16 (keyval,0x10 , &val);if (res <0 )continue ;
Signature · 1 line
2.0.0.526.g5318336