On 19/07/15 14:58, Jonathan Cameron wrote:
> On 09/07/15 22:51, Hartmut Knaack wrote:
>> 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@xxxxxx>
>> Reviewed-by: Tiberiu Breana <tiberiu.a.breana@xxxxxxxxx>
> Again, needs to wait for the fixes to make their way through the trees.
Applied to the togreg branch of iio.git - initially pushed out as
staging for the autobuilders to play with it.
J
>> ---
>> drivers/iio/light/stk3310.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
>> index d6df40220007..0056f4870357 100644
>> --- a/drivers/iio/light/stk3310.c
>> +++ b/drivers/iio/light/stk3310.c
>> @@ -35,8 +35,8 @@
>> #define STK3310_REG_ID 0x3E
>> #define STK3310_MAX_REG 0x80
>>
>> -#define STK3310_STATE_EN_PS 0x01
>> -#define STK3310_STATE_EN_ALS 0x02
>> +#define STK3310_STATE_EN_PS BIT(0)
>> +#define STK3310_STATE_EN_ALS BIT(1)
>> #define STK3310_STATE_STANDBY 0x00
>>
>> #define STK3310_CHIP_ID_VAL 0x13
>> @@ -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");
>> } else if (state != STK3310_STATE_STANDBY) {
>> /* Don't reset the 'enabled' flags if we're going in standby */
>> - data->ps_enabled = !!(state & 0x01);
>> - data->als_enabled = !!(state & 0x02);
>> + data->ps_enabled = !!(state & STK3310_STATE_EN_PS);
>> + data->als_enabled = !!(state & STK3310_STATE_EN_ALS);
>> }
>> mutex_unlock(&data->lock);
>>
>> @@ -683,7 +683,7 @@ static int stk3310_suspend(struct device *dev)
>>
>> static int stk3310_resume(struct device *dev)
>> {
>> - int state = 0;
>> + u8 state = 0;
>> struct stk3310_data *data;
>>
>> data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
