summaryrefslogtreecommitdiff
path: root/drivers/staging/olpc_dcon
diff options
context:
space:
mode:
authorValentin Rothberg <valentinrothberg@googlemail.com>2011-12-05 11:02:35 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-08 15:01:49 -0800
commitc542341dff7cd818015247d290aa0971888a7b08 (patch)
treebb5764db379cb86377f5e17a5243e8b8e2290a6d /drivers/staging/olpc_dcon
parent88e09a5e30a2b768480ab52628043e7d30a0e079 (diff)
Staging: olpc_dcon.c: obsolete use of strict_stroul
As Dan mentioned, dcon_write() will only write u16 values. The appropriate parts have been changed. As a result of module_param() not accepting u16 as a valid data type, ushort is used. Signed-off-by: Valentin Rothberg <valentinrothberg@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/olpc_dcon')
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 72b7ff108200..3d9199320d86 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -34,8 +34,8 @@
/* Module definitions */
-static int resumeline = 898;
-module_param(resumeline, int, 0444);
+static ushort resumeline = 898;
+module_param(resumeline, ushort, 0444);
/* Default off since it doesn't work on DCON ASIC in B-test OLPC board */
static int useaa = 1;
@@ -498,10 +498,10 @@ static ssize_t dcon_freeze_store(struct device *dev,
static ssize_t dcon_resumeline_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- unsigned long rl;
+ unsigned short rl;
int rc;
- rc = strict_strtoul(buf, 10, &rl);
+ rc = kstrtou16(buf, 10, &rl);
if (rc)
return rc;