Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056610ac authored by Daniel Walter's avatar Daniel Walter Committed by Linus Torvalds
Browse files

arch/arm/mach-omap2: 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: default avatarDaniel Walter <dwalter@google.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9213e78

arch/arm/mach-omap2/board-omap3touchbook.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -681,29 +681,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;
@@ -711,7 +701,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;
@@ -917,14 +907,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;