openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: Replace strict_strtoul() with kstrtoul() in ab* and att* 

The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Jingoo Han 2013-06-04 13:11:50 +09:00 committed by Lee Jones
parent fccf14ad1e
commit 8420a24138
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/aat2870-core.c
View File

@ -312,8 +312,9 @@ static ssize_t aat2870_reg_write_file(struct file *file,
while (*start == ' ') while (*start == ' ')
start++; start++;
if (strict_strtoul(start, 16, &val)) ret = kstrtoul(start, 16, &val);
return -EINVAL; if (ret)
return ret;
ret = aat2870->write(aat2870, (u8)addr, (u8)val); ret = aat2870->write(aat2870, (u8)addr, (u8)val);
if (ret) if (ret)

28
drivers/mfd/ab3100-core.c
View File

@ -491,7 +491,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
char buf[32]; char buf[32];
ssize_t buf_size; ssize_t buf_size;
int regp; int regp;
unsigned long user_reg; u8 user_reg;
int err; int err;
int i = 0; int i = 0;
@ -514,34 +514,29 @@ static ssize_t ab3100_get_set_reg(struct file *file,
/* /*
* Advance pointer to end of string then terminate * Advance pointer to end of string then terminate
* the register string. This is needed to satisfy * the register string. This is needed to satisfy
* the strict_strtoul() function. * the kstrtou8() function.
*/ */
while ((i < buf_size) && (buf[i] != ' ')) while ((i < buf_size) && (buf[i] != ' '))
i++; i++;
buf[i] = '\0'; buf[i] = '\0';
err = strict_strtoul(&buf[regp], 16, &user_reg); err = kstrtou8(&buf[regp], 16, &user_reg);
if (err) if (err)
return err; return err;
if (user_reg > 0xff)
return -EINVAL;
/* Either we read or we write a register here */ /* Either we read or we write a register here */
if (!priv->mode) { if (!priv->mode) {
/* Reading */ /* Reading */
u8 reg = (u8) user_reg;
u8 regvalue; u8 regvalue;
ab3100_get_register_interruptible(ab3100, reg, &regvalue); ab3100_get_register_interruptible(ab3100, user_reg, &regvalue);
dev_info(ab3100->dev, dev_info(ab3100->dev,
"debug read AB3100 reg[0x%02x]: 0x%02x\n", "debug read AB3100 reg[0x%02x]: 0x%02x\n",
reg, regvalue); user_reg, regvalue);
} else { } else {
int valp; int valp;
unsigned long user_value; u8 user_value;
u8 reg = (u8) user_reg;
u8 value;
u8 regvalue; u8 regvalue;
/* /*
@ -557,20 +552,17 @@ static ssize_t ab3100_get_set_reg(struct file *file,
i++; i++;
buf[i] = '\0'; buf[i] = '\0';
err = strict_strtoul(&buf[valp], 16, &user_value); err = kstrtou8(&buf[valp], 16, &user_value);
if (err) if (err)
return err; return err;
if (user_reg > 0xff)
return -EINVAL;
value = (u8) user_value; ab3100_set_register_interruptible(ab3100, user_reg, user_value);
ab3100_set_register_interruptible(ab3100, reg, value); ab3100_get_register_interruptible(ab3100, user_reg, &regvalue);
ab3100_get_register_interruptible(ab3100, reg, &regvalue);
dev_info(ab3100->dev, dev_info(ab3100->dev,
"debug write reg[0x%02x] with 0x%02x, " "debug write reg[0x%02x] with 0x%02x, "
"after readback: 0x%02x\n", "after readback: 0x%02x\n",
reg, value, regvalue); user_reg, user_value, regvalue);
} }
return buf_size; return buf_size;
} }

2
drivers/mfd/ab8500-debugfs.c
View File

@ -2757,7 +2757,7 @@ static ssize_t show_irq(struct device *dev,
unsigned int irq_index; unsigned int irq_index;
int err; int err;
err = strict_strtoul(attr->attr.name, 0, &name); err = kstrtoul(attr->attr.name, 0, &name);
if (err) if (err)
return err; return err;