Skip to content

Commit

Permalink
leds-lp5523: minor code style fixes
Browse files Browse the repository at this point in the history
(a) use LP5523_ENABLE rather than magic number 0x40
(b) use min_t() in lp5523_mux_parse()
(c) skip while loop and just return if invalid command

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
  • Loading branch information
Kim, Milo authored and Bryan Wu committed Sep 11, 2012
1 parent 6f6365f commit 469eba0
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/leds/leds-lp5523.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static int lp5523_detect(struct i2c_client *client)
int ret;
u8 buf;

ret = lp5523_write(client, LP5523_REG_ENABLE, 0x40);
ret = lp5523_write(client, LP5523_REG_ENABLE, LP5523_ENABLE);
if (ret)
return ret;
ret = lp5523_read(client, LP5523_REG_ENABLE, &buf);
Expand Down Expand Up @@ -338,7 +338,8 @@ static int lp5523_mux_parse(const char *buf, u16 *mux, size_t len)
{
int i;
u16 tmp_mux = 0;
len = len < LP5523_LEDS ? len : LP5523_LEDS;

len = min_t(int, len, LP5523_LEDS);
for (i = 0; i < len; i++) {
switch (buf[i]) {
case '1':
Expand Down Expand Up @@ -546,6 +547,9 @@ static int lp5523_do_store_load(struct lp5523_engine *engine,
unsigned cmd;
u8 pattern[LP5523_PROGRAM_LENGTH] = {0};

if (engine->mode != LP5523_CMD_LOAD)
return -EINVAL;

while ((offset < len - 1) && (i < LP5523_PROGRAM_LENGTH)) {
/* separate sscanfs because length is working only for %s */
ret = sscanf(buf + offset, "%2s%n ", c, &nrchars);
Expand All @@ -563,12 +567,7 @@ static int lp5523_do_store_load(struct lp5523_engine *engine,
goto fail;

mutex_lock(&chip->lock);

if (engine->mode == LP5523_CMD_LOAD)
ret = lp5523_load_program(engine, pattern);
else
ret = -EINVAL;

ret = lp5523_load_program(engine, pattern);
mutex_unlock(&chip->lock);

if (ret) {
Expand Down

0 comments on commit 469eba0

Please sign in to comment.