Skip to content

Commit

Permalink
iio:bma180: Prefix remaining tables and functions with bma18_
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Meerwald authored and Jonathan Cameron committed Sep 14, 2014
1 parent 16ed869 commit cab767d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/iio/accel/bma180.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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)
{
Expand All @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down

0 comments on commit cab767d

Please sign in to comment.