aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHartmut Knaack <knaack.h@gmx.de>2015-07-09 17:51:32 -0400
committerJonathan Cameron <jic23@kernel.org>2015-08-12 17:16:27 -0400
commit952c3aa3fb5538aa5026980cfdedb3d38829b67e (patch)
tree6123804ed69b168bb7de36b428afca3b7f5e9a2a
parent7c7a9eeaa335df03d692ad65e0767020ad1be374 (diff)
iio:light:stk3310: use correct names and type for state
Indicate the bit number of predefined states, make use of these names and change the state type in _resume to u8 to avoid type casting. Signed-off-by: Hartmut Knaack <knaack.h@gmx.de> Reviewed-by: Tiberiu Breana <tiberiu.a.breana@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/light/stk3310.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 09f2f6a30b79..e5e0b045ebc2 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -35,8 +35,8 @@
35#define STK3310_REG_ID 0x3E 35#define STK3310_REG_ID 0x3E
36#define STK3310_MAX_REG 0x80 36#define STK3310_MAX_REG 0x80
37 37
38#define STK3310_STATE_EN_PS 0x01 38#define STK3310_STATE_EN_PS BIT(0)
39#define STK3310_STATE_EN_ALS 0x02 39#define STK3310_STATE_EN_ALS BIT(1)
40#define STK3310_STATE_STANDBY 0x00 40#define STK3310_STATE_STANDBY 0x00
41 41
42#define STK3310_CHIP_ID_VAL 0x13 42#define STK3310_CHIP_ID_VAL 0x13
@@ -436,8 +436,8 @@ static int stk3310_set_state(struct stk3310_data *data, u8 state)
436 dev_err(&client->dev, "failed to change sensor state\n"); 436 dev_err(&client->dev, "failed to change sensor state\n");
437 } else if (state != STK3310_STATE_STANDBY) { 437 } else if (state != STK3310_STATE_STANDBY) {
438 /* Don't reset the 'enabled' flags if we're going in standby */ 438 /* Don't reset the 'enabled' flags if we're going in standby */
439 data->ps_enabled = !!(state & 0x01); 439 data->ps_enabled = !!(state & STK3310_STATE_EN_PS);
440 data->als_enabled = !!(state & 0x02); 440 data->als_enabled = !!(state & STK3310_STATE_EN_ALS);
441 } 441 }
442 mutex_unlock(&data->lock); 442 mutex_unlock(&data->lock);
443 443
@@ -683,7 +683,7 @@ static int stk3310_suspend(struct device *dev)
683 683
684static int stk3310_resume(struct device *dev) 684static int stk3310_resume(struct device *dev)
685{ 685{
686 int state = 0; 686 u8 state = 0;
687 struct stk3310_data *data; 687 struct stk3310_data *data;
688 688
689 data = iio_priv(i2c_get_clientdata(to_i2c_client(dev))); 689 data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));