LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH RFC resend] Remove _strtoul() function.
@ 2011-02-08 11:59 Marek Belisko
  2011-02-08 11:59 ` [PATCH RFC resend] staging: olpc_dcon: " Marek Belisko
  0 siblings, 1 reply; 2+ messages in thread
From: Marek Belisko @ 2011-02-08 11:59 UTC (permalink / raw)
  To: gregkh; +Cc: dilinger, cjb, jon.nettleton, devel, linux-kernel, Marek Belisko

Done on top of those patches:
# [PATCH 1/4] olpc_dcon: get rid of global i2c_client, create a dcon_priv struct   Andres Salomon
# [PATCH 2/4] olpc_dcon: change sysfs 'output' toggle to be clearer...   Andres Salomon
# [PATCH 3/4] olpc_dcon: move more variables into dcon_priv   Andres Salomon
# [PATCH 4/4] olpc_dcon: actually return the value of i2c_add_driver   Andres Salomon

Marek Belisko (1):
  staging: olpc_dcon: Remove _strtoul() function.

 drivers/staging/olpc_dcon/olpc_dcon.c |   57 +++++++++++++--------------------
 1 files changed, 22 insertions(+), 35 deletions(-)


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH RFC resend] staging: olpc_dcon: Remove _strtoul() function.
  2011-02-08 11:59 [PATCH RFC resend] Remove _strtoul() function Marek Belisko
@ 2011-02-08 11:59 ` Marek Belisko
  0 siblings, 0 replies; 2+ messages in thread
From: Marek Belisko @ 2011-02-08 11:59 UTC (permalink / raw)
  To: gregkh; +Cc: dilinger, cjb, jon.nettleton, devel, linux-kernel, Marek Belisko

olpc_dcon driver use self invented _strtoul  function
which make similar check like strict_strtoul just extend
for space checking at last string place. Normally access
to sys file looks echo 1024 > /sys/... so space could be considered
as error character and we could simplify code using just strict_strtoul
function instead self invented.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 drivers/staging/olpc_dcon/olpc_dcon.c |   57 +++++++++++++--------------------
 1 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index dbe3049..23c0d4b 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -538,48 +538,33 @@ static ssize_t dcon_resumeline_show(struct device *dev,
 	return sprintf(buf, "%d\n", resumeline);
 }
 
-static int _strtoul(const char *buf, int len, unsigned int *val)
-{
-
-	char *endp;
-	unsigned int output = strict_strtoul(buf, &endp, 0);
-	int size = endp - buf;
-
-	if (*endp && isspace(*endp))
-		size++;
-
-	if (size != len)
-		return -EINVAL;
-
-	*val = output;
-	return 0;
-}
-
 static ssize_t dcon_mono_store(struct device *dev,
 	struct device_attribute *attr, const char *buf, size_t count)
 {
-	int enable_mono;
-	int rc = -EINVAL;
+	unsigned long enable_mono;
+	int rc;
 
-	if (_strtoul(buf, count, &enable_mono))
-		return -EINVAL;
+	rc = strict_strtoul(buf, 10, &enable_mono);
+	if (rc)
+		return rc;
 
 	dcon_set_mono_mode(dev_get_drvdata(dev), enable_mono ? 1 : 0);
-	rc = count;
 
-	return rc;
+	return count;
 }
 
 static ssize_t dcon_freeze_store(struct device *dev,
 	struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct dcon_priv *dcon = dev_get_drvdata(dev);
-	int output;
+	unsigned long output;
+	int ret;
 
-	if (_strtoul(buf, count, &output))
-		return -EINVAL;
+	ret = strict_strtoul(buf, 10, &output);
+	if (ret)
+		return ret;
 
-	printk(KERN_INFO "dcon_freeze_store: %d\n", output);
+	printk(KERN_INFO "dcon_freeze_store: %lu\n", output);
 
 	switch (output) {
 	case 0:
@@ -601,26 +586,28 @@ 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)
 {
-	int rl;
-	int rc = -EINVAL;
+	unsigned long rl;
+	int rc;
 
-	if (_strtoul(buf, count, &rl))
+	rc = strict_strtoul(buf, 10, &rl);
+	if (rc)
 		return rc;
 
 	resumeline = rl;
 	dcon_write(dev_get_drvdata(dev), DCON_REG_SCAN_INT, resumeline);
-	rc = count;
 
-	return rc;
+	return count;
 }
 
 static ssize_t dcon_sleep_store(struct device *dev,
 	struct device_attribute *attr, const char *buf, size_t count)
 {
-	int output;
+	unsigned long output;
+	int ret;
 
-	if (_strtoul(buf, count, &output))
-		return -EINVAL;
+	ret = strict_strtoul(buf, 10, &output);
+	if (ret)
+		return ret;
 
 	dcon_sleep(dev_get_drvdata(dev), output ? true : false);
 	return count;
-- 
1.7.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-02-08 11:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-08 11:59 [PATCH RFC resend] Remove _strtoul() function Marek Belisko
2011-02-08 11:59 ` [PATCH RFC resend] staging: olpc_dcon: " Marek Belisko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).