提交 85e9304c 编写于 作者: B Brian Masney 提交者: Jonathan Cameron

staging: iio: tsl2583: change current chip state from a tristate to a bool

The current chip state is represented as a tristate (working, suspended,
and unknown). The unknown state was not used. This patch changes the
chip state so that it is now represented as a single boolean value
(suspended).
Signed-off-by: NBrian Masney <masneyb@onstation.org>
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
上级 2ff8a35b
...@@ -67,12 +67,6 @@ ...@@ -67,12 +67,6 @@
#define TSL2583_CHIP_ID 0x90 #define TSL2583_CHIP_ID 0x90
#define TSL2583_CHIP_ID_MASK 0xf0 #define TSL2583_CHIP_ID_MASK 0xf0
enum {
TSL258X_CHIP_UNKNOWN = 0,
TSL258X_CHIP_WORKING = 1,
TSL258X_CHIP_SUSPENDED = 2
};
/* Per-device data */ /* Per-device data */
struct taos_als_info { struct taos_als_info {
u16 als_ch0; u16 als_ch0;
...@@ -94,7 +88,7 @@ struct tsl2583_chip { ...@@ -94,7 +88,7 @@ struct tsl2583_chip {
struct taos_settings taos_settings; struct taos_settings taos_settings;
int als_time_scale; int als_time_scale;
int als_saturation; int als_saturation;
int taos_chip_status; bool suspended;
}; };
struct taos_lux { struct taos_lux {
...@@ -441,7 +435,7 @@ static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev) ...@@ -441,7 +435,7 @@ static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev)
if (ret < 0) if (ret < 0)
return ret; return ret;
chip->taos_chip_status = TSL258X_CHIP_WORKING; chip->suspended = false;
return ret; return ret;
} }
...@@ -494,7 +488,7 @@ static ssize_t in_illuminance_calibrate_store(struct device *dev, ...@@ -494,7 +488,7 @@ static ssize_t in_illuminance_calibrate_store(struct device *dev,
mutex_lock(&chip->als_mutex); mutex_lock(&chip->als_mutex);
if (chip->taos_chip_status != TSL258X_CHIP_WORKING) { if (chip->suspended) {
ret = -EBUSY; ret = -EBUSY;
goto done; goto done;
} }
...@@ -627,7 +621,7 @@ static int tsl2583_read_raw(struct iio_dev *indio_dev, ...@@ -627,7 +621,7 @@ static int tsl2583_read_raw(struct iio_dev *indio_dev,
mutex_lock(&chip->als_mutex); mutex_lock(&chip->als_mutex);
if (chip->taos_chip_status != TSL258X_CHIP_WORKING) { if (chip->suspended) {
ret = -EBUSY; ret = -EBUSY;
goto read_done; goto read_done;
} }
...@@ -704,7 +698,7 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev, ...@@ -704,7 +698,7 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev,
mutex_lock(&chip->als_mutex); mutex_lock(&chip->als_mutex);
if (chip->taos_chip_status != TSL258X_CHIP_WORKING) { if (chip->suspended) {
ret = -EBUSY; ret = -EBUSY;
goto write_done; goto write_done;
} }
...@@ -778,7 +772,7 @@ static int taos_probe(struct i2c_client *clientp, ...@@ -778,7 +772,7 @@ static int taos_probe(struct i2c_client *clientp,
i2c_set_clientdata(clientp, indio_dev); i2c_set_clientdata(clientp, indio_dev);
mutex_init(&chip->als_mutex); mutex_init(&chip->als_mutex);
chip->taos_chip_status = TSL258X_CHIP_UNKNOWN; chip->suspended = true;
ret = i2c_smbus_read_byte_data(clientp, ret = i2c_smbus_read_byte_data(clientp,
TSL258X_CMD_REG | TSL258X_CHIPID); TSL258X_CMD_REG | TSL258X_CHIPID);
...@@ -835,7 +829,7 @@ static int __maybe_unused taos_suspend(struct device *dev) ...@@ -835,7 +829,7 @@ static int __maybe_unused taos_suspend(struct device *dev)
mutex_lock(&chip->als_mutex); mutex_lock(&chip->als_mutex);
ret = tsl2583_set_power_state(chip, TSL258X_CNTL_PWR_OFF); ret = tsl2583_set_power_state(chip, TSL258X_CNTL_PWR_OFF);
chip->taos_chip_status = TSL258X_CHIP_SUSPENDED; chip->suspended = true;
mutex_unlock(&chip->als_mutex); mutex_unlock(&chip->als_mutex);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册