From c542341dff7cd818015247d290aa0971888a7b08 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 5 Dec 2011 11:02:35 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/olpc_dcon/olpc_dcon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index 72b7ff10820..3d9199320d8 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; -- 2.20.1