mfd: Use kstrtoul_from_user in ab8500
This patch replaces the code for getting an unsigned long from a userspace buffer by a simple call to kstroul_from_user. This makes it easier to read and less error prone. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
402fb48700
commit
8504d63804
|
@ -419,20 +419,13 @@ static ssize_t ab8500_bank_write(struct file *file,
|
|||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct device *dev = ((struct seq_file *)(file->private_data))->private;
|
||||
char buf[32];
|
||||
int buf_size;
|
||||
unsigned long user_bank;
|
||||
int err;
|
||||
|
||||
/* Get userspace string and assure termination */
|
||||
buf_size = min(count, (sizeof(buf) - 1));
|
||||
if (copy_from_user(buf, user_buf, buf_size))
|
||||
return -EFAULT;
|
||||
buf[buf_size] = 0;
|
||||
|
||||
err = strict_strtoul(buf, 0, &user_bank);
|
||||
err = kstrtoul_from_user(user_buf, count, 0, &user_bank);
|
||||
if (err)
|
||||
return -EINVAL;
|
||||
return err;
|
||||
|
||||
if (user_bank >= AB8500_NUM_BANKS) {
|
||||
dev_err(dev, "debugfs error input > number of banks\n");
|
||||
|
@ -441,7 +434,7 @@ static ssize_t ab8500_bank_write(struct file *file,
|
|||
|
||||
debug_bank = user_bank;
|
||||
|
||||
return buf_size;
|
||||
return count;
|
||||
}
|
||||
|
||||
static int ab8500_address_print(struct seq_file *s, void *p)
|
||||
|
@ -459,26 +452,20 @@ static ssize_t ab8500_address_write(struct file *file,
|
|||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct device *dev = ((struct seq_file *)(file->private_data))->private;
|
||||
char buf[32];
|
||||
int buf_size;
|
||||
unsigned long user_address;
|
||||
int err;
|
||||
|
||||
/* Get userspace string and assure termination */
|
||||
buf_size = min(count, (sizeof(buf) - 1));
|
||||
if (copy_from_user(buf, user_buf, buf_size))
|
||||
return -EFAULT;
|
||||
buf[buf_size] = 0;
|
||||
|
||||
err = strict_strtoul(buf, 0, &user_address);
|
||||
err = kstrtoul_from_user(user_buf, count, 0, &user_address);
|
||||
if (err)
|
||||
return -EINVAL;
|
||||
return err;
|
||||
|
||||
if (user_address > 0xff) {
|
||||
dev_err(dev, "debugfs error input > 0xff\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
debug_address = user_address;
|
||||
return buf_size;
|
||||
return count;
|
||||
}
|
||||
|
||||
static int ab8500_val_print(struct seq_file *s, void *p)
|
||||
|
@ -509,20 +496,14 @@ static ssize_t ab8500_val_write(struct file *file,
|
|||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct device *dev = ((struct seq_file *)(file->private_data))->private;
|
||||
char buf[32];
|
||||
int buf_size;
|
||||
unsigned long user_val;
|
||||
int err;
|
||||
|
||||
/* Get userspace string and assure termination */
|
||||
buf_size = min(count, (sizeof(buf)-1));
|
||||
if (copy_from_user(buf, user_buf, buf_size))
|
||||
return -EFAULT;
|
||||
buf[buf_size] = 0;
|
||||
|
||||
err = strict_strtoul(buf, 0, &user_val);
|
||||
err = kstrtoul_from_user(user_buf, count, 0, &user_val);
|
||||
if (err)
|
||||
return -EINVAL;
|
||||
return err;
|
||||
|
||||
if (user_val > 0xff) {
|
||||
dev_err(dev, "debugfs error input > 0xff\n");
|
||||
return -EINVAL;
|
||||
|
@ -534,7 +515,7 @@ static ssize_t ab8500_val_write(struct file *file,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
return buf_size;
|
||||
return count;
|
||||
}
|
||||
|
||||
static const struct file_operations ab8500_bank_fops = {
|
||||
|
|
Loading…
Reference in New Issue