aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-06-20 12:10:16 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:34 +0200
commit69d5781c2a10a05e8a2cf4e884929fd6be06d8db (patch)
tree380cc796527b92e877933c7f2c8ff095bb83312f
parentdecd9f43a53174f5900c292fbd8521ff0523535f (diff)
downloadlinux-2.6.38-lt-ux500-69d5781c2a10a05e8a2cf4e884929fd6be06d8db.tar.gz
ARM: ux500: prcmu-dbg: Tiny code clean-up
ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Change-Id: Ie89817c1de5be24d9aa362e98b7bdf94b03956e5 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25492 Reviewed-by: QATEST Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/prcmu-debug.c52
1 files changed, 17 insertions, 35 deletions
diff --git a/arch/arm/mach-ux500/prcmu-debug.c b/arch/arm/mach-ux500/prcmu-debug.c
index 44e7c15bbcf..8344ff36ffb 100644
--- a/arch/arm/mach-ux500/prcmu-debug.c
+++ b/arch/arm/mach-ux500/prcmu-debug.c
@@ -285,24 +285,19 @@ static ssize_t opp_write(struct file *file,
const char __user *user_buf,
size_t count, loff_t *ppos, int prcmu_qos_class)
{
- char buf[32];
- ssize_t buf_size;
- long unsigned int i;
+ long unsigned i;
+ 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 = kstrtoul_from_user(user_buf, count, 0, &i);
- if (strict_strtoul(buf, 0, &i) != 0)
- return buf_size;
+ if (err)
+ return err;
prcmu_qos_force_opp(prcmu_qos_class, i);
pr_info("prcmu debug: forced OPP for %d to %d\n", prcmu_qos_class, (int)i);
- return buf_size;
+ return count;
}
static ssize_t ddr_opp_write(struct file *file,
@@ -335,20 +330,13 @@ static ssize_t ape_voltage_write(struct file *file,
const char __user *user_buf,
size_t count, loff_t *ppos)
{
-
- char buf[32];
- ssize_t buf_size;
- long unsigned int i;
+ long unsigned i;
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 = kstrtoul_from_user(user_buf, count, 0, &i);
- if (strict_strtoul(buf, 0, &i) != 0)
- return buf_size;
+ if (err)
+ return err;
switch (i) {
case 0:
@@ -372,33 +360,27 @@ static ssize_t ape_voltage_write(struct file *file,
default:
pr_info("prcmu debug: value not equal to 0 or 1\n");
}
- return buf_size;
+ return count;
}
static ssize_t cpufreq_delay_write(struct file *file,
const char __user *user_buf,
size_t count, loff_t *ppos)
{
+ int err;
+ long unsigned i;
- char buf[32];
- ssize_t buf_size;
- long unsigned int i;
-
- /* 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 = kstrtoul_from_user(user_buf, count, 0, &i);
- if (strict_strtoul(buf, 0, &i) != 0)
- return buf_size;
+ if (err)
+ return err;
prcmu_qos_set_cpufreq_opp_delay(i);
pr_info("prcmu debug: changed delay between cpufreq change and QoS "
"requirement to %lu.\n", i);
- return buf_size;
+ return count;
}
static int arm_opp_open_file(struct inode *inode, struct file *file)