Commit 952c3aa3 authored by Hartmut Knaack's avatar Hartmut Knaack Committed by Jonathan Cameron

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: default avatarHartmut Knaack <knaack.h@gmx.de>
Reviewed-by: default avatarTiberiu Breana <tiberiu.a.breana@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7c7a9eea
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#define STK3310_REG_ID 0x3E #define STK3310_REG_ID 0x3E
#define STK3310_MAX_REG 0x80 #define STK3310_MAX_REG 0x80
#define STK3310_STATE_EN_PS 0x01 #define STK3310_STATE_EN_PS BIT(0)
#define STK3310_STATE_EN_ALS 0x02 #define STK3310_STATE_EN_ALS BIT(1)
#define STK3310_STATE_STANDBY 0x00 #define STK3310_STATE_STANDBY 0x00
#define STK3310_CHIP_ID_VAL 0x13 #define STK3310_CHIP_ID_VAL 0x13
...@@ -436,8 +436,8 @@ static int stk3310_set_state(struct stk3310_data *data, u8 state) ...@@ -436,8 +436,8 @@ static int stk3310_set_state(struct stk3310_data *data, u8 state)
dev_err(&client->dev, "failed to change sensor state\n"); dev_err(&client->dev, "failed to change sensor state\n");
} else if (state != STK3310_STATE_STANDBY) { } else if (state != STK3310_STATE_STANDBY) {
/* Don't reset the 'enabled' flags if we're going in standby */ /* Don't reset the 'enabled' flags if we're going in standby */
data->ps_enabled = !!(state & 0x01); data->ps_enabled = !!(state & STK3310_STATE_EN_PS);
data->als_enabled = !!(state & 0x02); data->als_enabled = !!(state & STK3310_STATE_EN_ALS);
} }
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
...@@ -683,7 +683,7 @@ static int stk3310_suspend(struct device *dev) ...@@ -683,7 +683,7 @@ static int stk3310_suspend(struct device *dev)
static int stk3310_resume(struct device *dev) static int stk3310_resume(struct device *dev)
{ {
int state = 0; u8 state = 0;
struct stk3310_data *data; struct stk3310_data *data;
data = iio_priv(i2c_get_clientdata(to_i2c_client(dev))); data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment