From: Dan Carpenter <dan.carpenter@oracle.com>
To: Richard Purdie <rpurdie@rpsys.net>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] leds: lm3556: fix fallout from checkpatch fixes
Date: Wed, 04 Apr 2012 11:22:40 +0000 [thread overview]
Message-ID: <20120404112240.GC23719@elgon.mountain> (raw)
Patch 476b78f277 "leds-add-led-driver-for-lm3556-chip-checkpatch-fixes"
introduces a bug where we use "after" without initializing it.
In the original code, "count" and "after" were used to tell if
simple_strtoul() found a valid number. Now that we've changed it to
kstrtoul(), we can just get rid of both variables. It makes the whole
function simpler.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/leds/leds-lm3556.c b/drivers/leds/leds-lm3556.c
index 64e751c..886a5d3 100644
--- a/drivers/leds/leds-lm3556.c
+++ b/drivers/leds/leds-lm3556.c
@@ -316,31 +316,23 @@ static ssize_t lm3556_indicator_pattern_store(struct device *dev,
struct device_attribute *devAttr,
const char *buf, size_t size)
{
- char *after;
- ssize_t ret;
struct i2c_client *client = container_of(dev->parent,
struct i2c_client, dev);
unsigned long state;
- size_t count = after - buf;
+ int ret;
ret = kstrtoul(buf, 10, &state);
if (ret)
goto out;
- if (isspace(*after))
- count++;
-
- if (count = size) {
- ret = count;
-
- if (state > INDIC_PATTERN_SIZE - 1)
- state = INDIC_PATTERN_SIZE - 1;
- lm3556_write_reg(client, REG_INDIC_BLINK,
- indicator_pattern[state].blinking);
- lm3556_write_reg(client, REG_INDIC_PERIOD,
- indicator_pattern[state].period_cnt);
- }
+
+ if (state > INDIC_PATTERN_SIZE - 1)
+ state = INDIC_PATTERN_SIZE - 1;
+ lm3556_write_reg(client, REG_INDIC_BLINK,
+ indicator_pattern[state].blinking);
+ lm3556_write_reg(client, REG_INDIC_PERIOD,
+ indicator_pattern[state].period_cnt);
out:
- return ret;
+ return size;
}
static DEVICE_ATTR(pattern, 0644, NULL, lm3556_indicator_pattern_store);
reply other threads:[~2012-04-04 11:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120404112240.GC23719@elgon.mountain \
--to=dan.carpenter@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox