renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

iio:bma180: Use bool instead of int for state

Browse Source 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Peter Meerwald 2014-08-19 23:43:00 +01:00 committed by Jonathan Cameron
parent 9a70b147da
commit c7c69e8540
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/iio/accel/bma180.c
View File

@ -62,11 +62,8 @@
#define BMA180_LOW_NOISE 0x00 #define BMA180_LOW_NOISE 0x00
#define BMA180_LOW_POWER 0x03 #define BMA180_LOW_POWER 0x03
#define BMA180_LOW_NOISE_STR "low_noise"
#define BMA180_LOW_POWER_STR "low_power"
/* Defaults values */ /* Defaults values */
#define BMA180_DEF_PMODE 0 #define BMA180_DEF_PMODE false
#define BMA180_DEF_BW 20 #define BMA180_DEF_BW 20
#define BMA180_DEF_SCALE 2452 #define BMA180_DEF_SCALE 2452
@ -80,10 +77,10 @@ struct bma180_data {
struct i2c_client *client; struct i2c_client *client;
struct iio_trigger *trig; struct iio_trigger *trig;
struct mutex mutex; struct mutex mutex;
int sleep_state; bool sleep_state;
int scale; int scale;
int bw; int bw;
int pmode; bool pmode;
char *buff; char *buff;
}; };
@ -133,7 +130,7 @@ static int bma180_reset_intr(struct bma180_data *data)
return ret; return ret;
} }
static int bma180_set_new_data_intr_state(struct bma180_data *data, int state) static int bma180_set_new_data_intr_state(struct bma180_data *data, bool state)
{ {
u8 reg_val = state ? BMA180_NEW_DATA_INT : 0x00; u8 reg_val = state ? BMA180_NEW_DATA_INT : 0x00;
int ret = i2c_smbus_write_byte_data(data->client, BMA180_CTRL_REG3, int ret = i2c_smbus_write_byte_data(data->client, BMA180_CTRL_REG3,
@ -153,7 +150,7 @@ err:
return ret; return ret;
} }
static int bma180_set_sleep_state(struct bma180_data *data, int state) static int bma180_set_sleep_state(struct bma180_data *data, bool state)
{ {
int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_SLEEP, state); int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_SLEEP, state);
@ -167,7 +164,7 @@ static int bma180_set_sleep_state(struct bma180_data *data, int state)
return 0; return 0;
} }
static int bma180_set_ee_writing_state(struct bma180_data *data, int state) static int bma180_set_ee_writing_state(struct bma180_data *data, bool state)
{ {
int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_EE_W, state); int ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_EE_W, state);
@ -225,7 +222,7 @@ static int bma180_set_scale(struct bma180_data *data, int val)
return -EINVAL; return -EINVAL;
} }
static int bma180_set_pmode(struct bma180_data *data, int mode) static int bma180_set_pmode(struct bma180_data *data, bool mode)
{ {
u8 reg_val = mode ? BMA180_LOW_POWER : BMA180_LOW_NOISE; u8 reg_val = mode ? BMA180_LOW_POWER : BMA180_LOW_NOISE;
int ret = bma180_set_bits(data, BMA180_TCO_Z, BMA180_MODE_CONFIG, int ret = bma180_set_bits(data, BMA180_TCO_Z, BMA180_MODE_CONFIG,
@ -275,10 +272,10 @@ static int bma180_chip_init(struct bma180_data *data)
ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_DIS_WAKE_UP, 1); ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_DIS_WAKE_UP, 1);
if (ret) if (ret)
goto err; goto err;
ret = bma180_set_ee_writing_state(data, 1); ret = bma180_set_ee_writing_state(data, true);
if (ret) if (ret)
goto err; goto err;
ret = bma180_set_new_data_intr_state(data, 0); ret = bma180_set_new_data_intr_state(data, false);
if (ret) if (ret)
goto err; goto err;
ret = bma180_set_bits(data, BMA180_OFFSET_LSB1, BMA180_SMP_SKIP, 1); ret = bma180_set_bits(data, BMA180_OFFSET_LSB1, BMA180_SMP_SKIP, 1);
@ -303,11 +300,11 @@ err:
static void bma180_chip_disable(struct bma180_data *data) static void bma180_chip_disable(struct bma180_data *data)
{ {
if (bma180_set_new_data_intr_state(data, 0)) if (bma180_set_new_data_intr_state(data, false))
goto err; goto err;
if (bma180_set_ee_writing_state(data, 0)) if (bma180_set_ee_writing_state(data, false))
goto err; goto err;
if (bma180_set_sleep_state(data, 1)) if (bma180_set_sleep_state(data, true))
goto err; goto err;
return; return;
@ -410,10 +407,7 @@ static const struct iio_info bma180_info = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
}; };
static const char * const bma180_power_modes[] = { static const char * const bma180_power_modes[] = { "low_noise", "low_power" };
BMA180_LOW_NOISE_STR,
BMA180_LOW_POWER_STR,
};
static int bma180_get_power_mode(struct iio_dev *indio_dev, static int bma180_get_power_mode(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan) const struct iio_chan_spec *chan)
@ -633,7 +627,7 @@ static int bma180_suspend(struct device *dev)
int ret; int ret;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
ret = bma180_set_sleep_state(data, 1); ret = bma180_set_sleep_state(data, true);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;
@ -646,7 +640,7 @@ static int bma180_resume(struct device *dev)
int ret; int ret;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
ret = bma180_set_sleep_state(data, 0); ret = bma180_set_sleep_state(data, false);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;