Skip to content

L
linux
Commit dc2c5715 authored by Alison Schofield's avatar Alison Schofield Committed by Jonathan Cameron
Browse files
Options

iio: gyro: bmg160: use regmap to retrieve struct device 

Driver includes struct regmap and struct device in its global data.
Remove the struct device and use regmap API to retrieve device info.

Patch created using Coccinelle plus manual edits.
Signed-off-by: default avatarAlison Schofield <amsfield22@gmail.com>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 0ef4c311
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
drivers/iio/gyro/bmg160_core.c
View file @ dc2c5715
...@@ -95,7 +95,6 @@ ...@@ -95,7 +95,6 @@
#define BMG160_AUTO_SUSPEND_DELAY_MS 2000 #define BMG160_AUTO_SUSPEND_DELAY_MS 2000
struct bmg160_data { struct bmg160_data {
struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct iio_trigger *dready_trig; struct iio_trigger *dready_trig;
struct iio_trigger *motion_trig; struct iio_trigger *motion_trig;
...@@ -137,11 +136,12 @@ static const struct { ...@@ -137,11 +136,12 @@ static const struct {
static int bmg160_set_mode(struct bmg160_data *data, u8 mode) static int bmg160_set_mode(struct bmg160_data *data, u8 mode)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
ret = regmap_write(data->regmap, BMG160_REG_PMU_LPW, mode); ret = regmap_write(data->regmap, BMG160_REG_PMU_LPW, mode);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_pmu_lpw\n"); dev_err(dev, "Error writing reg_pmu_lpw\n");
return ret; return ret;
} }
...@@ -162,6 +162,7 @@ static int bmg160_convert_freq_to_bit(int val) ...@@ -162,6 +162,7 @@ static int bmg160_convert_freq_to_bit(int val)
static int bmg160_set_bw(struct bmg160_data *data, int val) static int bmg160_set_bw(struct bmg160_data *data, int val)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
int bw_bits; int bw_bits;
...@@ -171,7 +172,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val) ...@@ -171,7 +172,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)
ret = regmap_write(data->regmap, BMG160_REG_PMU_BW, bw_bits); ret = regmap_write(data->regmap, BMG160_REG_PMU_BW, bw_bits);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_pmu_bw\n"); dev_err(dev, "Error writing reg_pmu_bw\n");
return ret; return ret;
} }
...@@ -182,18 +183,19 @@ static int bmg160_set_bw(struct bmg160_data *data, int val) ...@@ -182,18 +183,19 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)
static int bmg160_chip_init(struct bmg160_data *data) static int bmg160_chip_init(struct bmg160_data *data)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
unsigned int val; unsigned int val;
ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error reading reg_chip_id\n"); dev_err(dev, "Error reading reg_chip_id\n");
return ret; return ret;
} }
dev_dbg(data->dev, "Chip Id %x\n", val); dev_dbg(dev, "Chip Id %x\n", val);
if (val != BMG160_CHIP_ID_VAL) { if (val != BMG160_CHIP_ID_VAL) {
dev_err(data->dev, "invalid chip %x\n", val); dev_err(dev, "invalid chip %x\n", val);
return -ENODEV; return -ENODEV;
} }
...@@ -212,14 +214,14 @@ static int bmg160_chip_init(struct bmg160_data *data) ...@@ -212,14 +214,14 @@ static int bmg160_chip_init(struct bmg160_data *data)
/* Set Default Range */ /* Set Default Range */
ret = regmap_write(data->regmap, BMG160_REG_RANGE, BMG160_RANGE_500DPS); ret = regmap_write(data->regmap, BMG160_REG_RANGE, BMG160_RANGE_500DPS);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_range\n"); dev_err(dev, "Error writing reg_range\n");
return ret; return ret;
} }
data->dps_range = BMG160_RANGE_500DPS; data->dps_range = BMG160_RANGE_500DPS;
ret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES, &val); ret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES, &val);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error reading reg_slope_thres\n"); dev_err(dev, "Error reading reg_slope_thres\n");
return ret; return ret;
} }
data->slope_thres = val; data->slope_thres = val;
...@@ -228,7 +230,7 @@ static int bmg160_chip_init(struct bmg160_data *data) ...@@ -228,7 +230,7 @@ static int bmg160_chip_init(struct bmg160_data *data)
ret = regmap_update_bits(data->regmap, BMG160_REG_INT_EN_1, ret = regmap_update_bits(data->regmap, BMG160_REG_INT_EN_1,
BMG160_INT1_BIT_OD, 0); BMG160_INT1_BIT_OD, 0);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error updating bits in reg_int_en_1\n"); dev_err(dev, "Error updating bits in reg_int_en_1\n");
return ret; return ret;
} }
...@@ -236,7 +238,7 @@ static int bmg160_chip_init(struct bmg160_data *data) ...@@ -236,7 +238,7 @@ static int bmg160_chip_init(struct bmg160_data *data)
BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev,
"Error writing reg_motion_intr\n"); "Error writing reg_motion_intr\n");
return ret; return ret;
} }
...@@ -247,20 +249,21 @@ static int bmg160_chip_init(struct bmg160_data *data) ...@@ -247,20 +249,21 @@ static int bmg160_chip_init(struct bmg160_data *data)
static int bmg160_set_power_state(struct bmg160_data *data, bool on) static int bmg160_set_power_state(struct bmg160_data *data, bool on)
{ {
#ifdef CONFIG_PM #ifdef CONFIG_PM
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
if (on) if (on)
ret = pm_runtime_get_sync(data->dev); ret = pm_runtime_get_sync(dev);
else { else {
pm_runtime_mark_last_busy(data->dev); pm_runtime_mark_last_busy(dev);
ret = pm_runtime_put_autosuspend(data->dev); ret = pm_runtime_put_autosuspend(dev);
} }
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Failed: bmg160_set_power_state for %d\n", on);
"Failed: bmg160_set_power_state for %d\n", on);
if (on) if (on)
pm_runtime_put_noidle(data->dev); pm_runtime_put_noidle(dev);
return ret; return ret;
} }
...@@ -272,6 +275,7 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on) ...@@ -272,6 +275,7 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on)
static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
bool status) bool status)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
/* Enable/Disable INT_MAP0 mapping */ /* Enable/Disable INT_MAP0 mapping */
...@@ -279,7 +283,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -279,7 +283,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
BMG160_INT_MAP_0_BIT_ANY, BMG160_INT_MAP_0_BIT_ANY,
(status ? BMG160_INT_MAP_0_BIT_ANY : 0)); (status ? BMG160_INT_MAP_0_BIT_ANY : 0));
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error updating bits reg_int_map0\n"); dev_err(dev, "Error updating bits reg_int_map0\n");
return ret; return ret;
} }
...@@ -289,8 +293,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -289,8 +293,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
ret = regmap_write(data->regmap, BMG160_REG_SLOPE_THRES, ret = regmap_write(data->regmap, BMG160_REG_SLOPE_THRES,
data->slope_thres); data->slope_thres);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_slope_thres\n");
"Error writing reg_slope_thres\n");
return ret; return ret;
} }
...@@ -298,8 +301,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -298,8 +301,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
BMG160_INT_MOTION_X | BMG160_INT_MOTION_Y | BMG160_INT_MOTION_X | BMG160_INT_MOTION_Y |
BMG160_INT_MOTION_Z); BMG160_INT_MOTION_Z);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_motion_intr\n");
"Error writing reg_motion_intr\n");
return ret; return ret;
} }
...@@ -314,8 +316,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -314,8 +316,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_rst_latch\n");
"Error writing reg_rst_latch\n");
return ret; return ret;
} }
} }
...@@ -328,7 +329,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -328,7 +329,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
} }
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_int_en0\n"); dev_err(dev, "Error writing reg_int_en0\n");
return ret; return ret;
} }
...@@ -338,6 +339,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ...@@ -338,6 +339,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,
static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,
bool status) bool status)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
/* Enable/Disable INT_MAP1 mapping */ /* Enable/Disable INT_MAP1 mapping */
...@@ -345,7 +347,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, ...@@ -345,7 +347,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,
BMG160_INT_MAP_1_BIT_NEW_DATA, BMG160_INT_MAP_1_BIT_NEW_DATA,
(status ? BMG160_INT_MAP_1_BIT_NEW_DATA : 0)); (status ? BMG160_INT_MAP_1_BIT_NEW_DATA : 0));
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error updating bits in reg_int_map1\n"); dev_err(dev, "Error updating bits in reg_int_map1\n");
return ret; return ret;
} }
...@@ -354,9 +356,8 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, ...@@ -354,9 +356,8 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,
BMG160_INT_MODE_NON_LATCH_INT | BMG160_INT_MODE_NON_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_rst_latch\n");
"Error writing reg_rst_latch\n"); return ret;
return ret;
} }
ret = regmap_write(data->regmap, BMG160_REG_INT_EN_0, ret = regmap_write(data->regmap, BMG160_REG_INT_EN_0,
...@@ -368,16 +369,15 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, ...@@ -368,16 +369,15 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,
BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_rst_latch\n");
"Error writing reg_rst_latch\n"); return ret;
return ret;
} }
ret = regmap_write(data->regmap, BMG160_REG_INT_EN_0, 0); ret = regmap_write(data->regmap, BMG160_REG_INT_EN_0, 0);
} }
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_int_en0\n"); dev_err(dev, "Error writing reg_int_en0\n");
return ret; return ret;
} }
...@@ -400,6 +400,7 @@ static int bmg160_get_bw(struct bmg160_data *data, int *val) ...@@ -400,6 +400,7 @@ static int bmg160_get_bw(struct bmg160_data *data, int *val)
static int bmg160_set_scale(struct bmg160_data *data, int val) static int bmg160_set_scale(struct bmg160_data *data, int val)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret, i; int ret, i;
for (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) { for (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) {
...@@ -407,8 +408,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val) ...@@ -407,8 +408,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)
ret = regmap_write(data->regmap, BMG160_REG_RANGE, ret = regmap_write(data->regmap, BMG160_REG_RANGE,
bmg160_scale_table[i].dps_range); bmg160_scale_table[i].dps_range);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, dev_err(dev, "Error writing reg_range\n");
"Error writing reg_range\n");
return ret; return ret;
} }
data->dps_range = bmg160_scale_table[i].dps_range; data->dps_range = bmg160_scale_table[i].dps_range;
...@@ -421,6 +421,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val) ...@@ -421,6 +421,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)
static int bmg160_get_temp(struct bmg160_data *data, int *val) static int bmg160_get_temp(struct bmg160_data *data, int *val)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
unsigned int raw_val; unsigned int raw_val;
...@@ -433,7 +434,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val) ...@@ -433,7 +434,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)
ret = regmap_read(data->regmap, BMG160_REG_TEMP, &raw_val); ret = regmap_read(data->regmap, BMG160_REG_TEMP, &raw_val);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error reading reg_temp\n"); dev_err(dev, "Error reading reg_temp\n");
bmg160_set_power_state(data, false); bmg160_set_power_state(data, false);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;
...@@ -450,6 +451,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val) ...@@ -450,6 +451,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)
static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val) static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
{ {
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
unsigned int raw_val; unsigned int raw_val;
...@@ -463,7 +465,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val) ...@@ -463,7 +465,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(axis), &raw_val, ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(axis), &raw_val,
2); 2);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error reading axis %d\n", axis); dev_err(dev, "Error reading axis %d\n", axis);
bmg160_set_power_state(data, false); bmg160_set_power_state(data, false);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;
...@@ -793,6 +795,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig) ...@@ -793,6 +795,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)
{ {
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
struct bmg160_data *data = iio_priv(indio_dev); struct bmg160_data *data = iio_priv(indio_dev);
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
/* new data interrupts don't need ack */ /* new data interrupts don't need ack */
...@@ -804,7 +807,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig) ...@@ -804,7 +807,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)
BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error writing reg_rst_latch\n"); dev_err(dev, "Error writing reg_rst_latch\n");
return ret; return ret;
} }
...@@ -864,13 +867,14 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ...@@ -864,13 +867,14 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)
{ {
struct iio_dev *indio_dev = private; struct iio_dev *indio_dev = private;
struct bmg160_data *data = iio_priv(indio_dev); struct bmg160_data *data = iio_priv(indio_dev);
struct device *dev = regmap_get_device(data->regmap);
int ret; int ret;
int dir; int dir;
unsigned int val; unsigned int val;
ret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2, &val); ret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2, &val);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "Error reading reg_int_status2\n"); dev_err(dev, "Error reading reg_int_status2\n");
goto ack_intr_status; goto ack_intr_status;
} }
...@@ -907,8 +911,7 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ...@@ -907,8 +911,7 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)
BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_INT |
BMG160_INT_MODE_LATCH_RESET); BMG160_INT_MODE_LATCH_RESET);
if (ret < 0) if (ret < 0)
dev_err(data->dev, dev_err(dev, "Error writing reg_rst_latch\n");
"Error writing reg_rst_latch\n");
} }
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -976,7 +979,6 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, ...@@ -976,7 +979,6 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
dev_set_drvdata(dev, indio_dev); dev_set_drvdata(dev, indio_dev);
data->dev = dev;
data->irq = irq; data->irq = irq;
data->regmap = regmap; data->regmap = regmap;
...@@ -1139,7 +1141,7 @@ static int bmg160_runtime_suspend(struct device *dev) ...@@ -1139,7 +1141,7 @@ static int bmg160_runtime_suspend(struct device *dev)
ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND); ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);
if (ret < 0) { if (ret < 0) {
dev_err(data->dev, "set mode failed\n"); dev_err(dev, "set mode failed\n");
return -EAGAIN; return -EAGAIN;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7