From 8de708cb9c31f3830ec0d851c330751f63757795 Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Tue, 21 Aug 2012 17:03:58 +0800 Subject: [PATCH] --- yaml --- r: 333071 b: refs/heads/master c: 6f6365fbac2d6bcf6867c633d3ec33af08b5b219 h: refs/heads/master i: 333069: fc3a6c6e7710acceb0bc3b54ef186f8bbe7ee5ed 333067: 378d199e49ea1d7cb03c6f680bb764bc8f4aa38d 333063: b2b9e6f49bf94994995238afa66fb69eb01ea4b3 333055: ab37790106b79d4541265b5c427fc3d871796634 v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-lp5523.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e962fde4dc82..dce7879de7d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a39b9854c79cc9ac7b7b6fed58cf07da23f1f41e +refs/heads/master: 6f6365fbac2d6bcf6867c633d3ec33af08b5b219 diff --git a/trunk/drivers/leds/leds-lp5523.c b/trunk/drivers/leds/leds-lp5523.c index 2fd5689f65c0..a14495402cc5 100644 --- a/trunk/drivers/leds/leds-lp5523.c +++ b/trunk/drivers/leds/leds-lp5523.c @@ -150,7 +150,7 @@ static inline struct lp5523_chip *led_to_lp5523(struct lp5523_led *led) leds[led->id]); } -static int lp5523_set_mode(struct lp5523_engine *engine, u8 mode); +static void lp5523_set_mode(struct lp5523_engine *engine, u8 mode); static int lp5523_set_engine_mode(struct lp5523_engine *engine, u8 mode); static int lp5523_load_program(struct lp5523_engine *engine, const u8 *pattern); @@ -789,26 +789,28 @@ static void lp5523_unregister_sysfs(struct i2c_client *client) /*--------------------------------------------------------------*/ /* Set chip operating mode */ /*--------------------------------------------------------------*/ -static int lp5523_set_mode(struct lp5523_engine *engine, u8 mode) +static void lp5523_set_mode(struct lp5523_engine *engine, u8 mode) { - int ret = 0; - /* if in that mode already do nothing, except for run */ if (mode == engine->mode && mode != LP5523_CMD_RUN) - return 0; + return; - if (mode == LP5523_CMD_RUN) { - ret = lp5523_run_program(engine); - } else if (mode == LP5523_CMD_LOAD) { + switch (mode) { + case LP5523_CMD_RUN: + lp5523_run_program(engine); + break; + case LP5523_CMD_LOAD: lp5523_set_engine_mode(engine, LP5523_CMD_DISABLED); lp5523_set_engine_mode(engine, LP5523_CMD_LOAD); - } else if (mode == LP5523_CMD_DISABLED) { + break; + case LP5523_CMD_DISABLED: lp5523_set_engine_mode(engine, LP5523_CMD_DISABLED); + break; + default: + return; } engine->mode = mode; - - return ret; } /*--------------------------------------------------------------*/