summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2014-08-19 23:43:00 +0100
committerJonathan Cameron <jic23@kernel.org>2014-09-14 20:25:59 +0100
commitc1949ec18e50e1e23f3045a7c3836c289f553bb8 (patch)
tree459f21ec4e29262f5135bbf6b562182573f4922d /drivers/iio
parent1b9030f5a0ac7c71bc733af3c9c1064204fc0258 (diff)
downloadop-kernel-dev-c1949ec18e50e1e23f3045a7c3836c289f553bb8.zip
op-kernel-dev-c1949ec18e50e1e23f3045a7c3836c289f553bb8.tar.gz
iio:bma180: Introduce part-specific _config() and disable() code
move part of bma180_init() to bma180_config() (split initialization and configuration code); configuration is heavily chip-specific Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/accel/bma180.c33
1 files changed, 23 insertions, 10 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 5df5991..9336455 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -30,6 +30,8 @@ enum {
BMA180,
};
+struct bma180_data;
+
struct bma180_part_info {
const struct iio_chan_spec *channels;
unsigned num_channels;
@@ -37,6 +39,8 @@ struct bma180_part_info {
unsigned num_scales;
const int *bw_table;
unsigned num_bw;
+ int (*chip_config)(struct bma180_data *data);
+ void (*chip_disable)(struct bma180_data *data);
};
/* Register set */
@@ -279,21 +283,28 @@ static int bma180_chip_init(struct bma180_data *data)
int ret = i2c_smbus_read_byte_data(data->client, BMA180_CHIP_ID);
if (ret < 0)
- goto err;
- if (ret != BMA180_ID_REG_VAL) {
- ret = -ENODEV;
- goto err;
- }
+ return ret;
+ if (ret != BMA180_ID_REG_VAL)
+ return -ENODEV;
ret = bma180_soft_reset(data);
if (ret)
- goto err;
+ return ret;
/*
* No serial transaction should occur within minimum 10 us
* after soft_reset command
*/
msleep(20);
+ return 0;
+}
+
+static int bma180_chip_config(struct bma180_data *data)
+{
+ int ret = bma180_chip_init(data);
+
+ if (ret)
+ goto err;
ret = bma180_set_bits(data, BMA180_CTRL_REG0, BMA180_DIS_WAKE_UP, 1);
if (ret)
goto err;
@@ -319,7 +330,7 @@ static int bma180_chip_init(struct bma180_data *data)
return 0;
err:
- dev_err(&data->client->dev, "failed to init the chip\n");
+ dev_err(&data->client->dev, "failed to config the chip\n");
return ret;
}
@@ -507,6 +518,8 @@ static const struct bma180_part_info bma180_part_info[] = {
bma180_channels, ARRAY_SIZE(bma180_channels),
bma180_scale_table, ARRAY_SIZE(bma180_scale_table),
bma180_bw_table, ARRAY_SIZE(bma180_bw_table),
+ bma180_chip_config,
+ bma180_chip_disable,
},
};
@@ -578,7 +591,7 @@ static int bma180_probe(struct i2c_client *client,
data->client = client;
data->part_info = &bma180_part_info[id->driver_data];
- ret = bma180_chip_init(data);
+ ret = data->part_info->chip_config(data);
if (ret < 0)
goto err_chip_disable;
@@ -640,7 +653,7 @@ err_trigger_unregister:
err_trigger_free:
iio_trigger_free(data->trig);
err_chip_disable:
- bma180_chip_disable(data);
+ data->part_info->chip_disable(data);
return ret;
}
@@ -658,7 +671,7 @@ static int bma180_remove(struct i2c_client *client)
}
mutex_lock(&data->mutex);
- bma180_chip_disable(data);
+ data->part_info->chip_disable(data);
mutex_unlock(&data->mutex);
return 0;
OpenPOWER on IntegriCloud