diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-08-19 23:43:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-09-14 18:47:23 +0100 |
| commit | cab767d54daf775bc40322e9f8d4393b0c91a447 (patch) | |
| tree | b1ab062047532ac9ef606bc0076a630a2394bd5b | |
| parent | 16ed8692fa487c0a1569edd0e210357c087e1cc5 (diff) | |
iio:bma180: Prefix remaining tables and functions with bma18_
and minor cleanups
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/accel/bma180.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c index f5e26fb697a3..d7f34b465759 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -49,7 +49,7 @@ #define BMA180_SMP_SKIP BIT(0) /* Bit masks for registers bit fields */ -#define BMA180_RANGE 0x0e /* Range of measured accel values*/ +#define BMA180_RANGE 0x0e /* Range of measured accel values */ #define BMA180_BW 0xf0 /* Accel bandwidth */ #define BMA180_MODE_CONFIG 0x03 /* Config operation modes */ @@ -93,8 +93,8 @@ enum bma180_axis { AXIS_Z, }; -static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */ -static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 }; +static int bma180_bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */ +static int bma180_scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 }; static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis) { @@ -107,7 +107,7 @@ static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis) ret = i2c_smbus_read_word_data(data->client, reg); if (ret < 0) dev_err(&data->client->dev, - "failed to read accel_%c registers\n", 'x' + axis); + "failed to read accel_%c register\n", 'x' + axis); return ret; } @@ -185,8 +185,8 @@ static int bma180_set_bw(struct bma180_data *data, int val) if (data->sleep_state) return -EBUSY; - for (i = 0; i < ARRAY_SIZE(bw_table); ++i) { - if (bw_table[i] == val) { + for (i = 0; i < ARRAY_SIZE(bma180_bw_table); ++i) { + if (bma180_bw_table[i] == val) { ret = bma180_set_bits(data, BMA180_BW_TCS, BMA180_BW, i); if (ret) { @@ -209,8 +209,8 @@ static int bma180_set_scale(struct bma180_data *data, int val) if (data->sleep_state) return -EBUSY; - for (i = 0; i < ARRAY_SIZE(scale_table); ++i) - if (scale_table[i] == val) { + for (i = 0; i < ARRAY_SIZE(bma180_scale_table); ++i) + if (bma180_scale_table[i] == val) { ret = bma180_set_bits(data, BMA180_OFFSET_LSB1, BMA180_RANGE, i); if (ret) { |