Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cab767d5 authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron
Browse files

iio:bma180: Prefix remaining tables and functions with bma18_ 



and minor cleanups

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 16ed8692

drivers/iio/accel/bma180.c

+8 −8
Original line number Diff line number Diff line
@@ -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) {