Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: accel: adxl345: rename variable data to st
Rename the locally used variable data to st. The st refers to "state",
representing the internal state of the driver object. Further it
prepares the usage of an internal data pointer needed for the
implementation of the sensor features.
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Link: https://patch.msgid.link/20241205171343.308963-3-l.rubusch@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Lothar Rubusch
and committed by
Jonathan Cameron
aed2bcd2
4df71ef0
+22
-22
+22
-22
drivers/iio/accel/adxl345_core.c
+22
-22
drivers/iio/accel/adxl345_core.c
···
17
17
18
18
#include "adxl345.h"
19
19
20
-
struct adxl345_data {
20
+
struct adxl345_state {
21
21
const struct adxl345_chip_info *info;
22
22
struct regmap *regmap;
23
23
};
···
43
43
struct iio_chan_spec const *chan,
44
44
int *val, int *val2, long mask)
45
45
{
46
-
struct adxl345_data *data = iio_priv(indio_dev);
46
+
struct adxl345_state *st = iio_priv(indio_dev);
47
47
__le16 accel;
48
48
long long samp_freq_nhz;
49
49
unsigned int regval;
···
56
56
* ADXL345_REG_DATA(X0/Y0/Z0) contain the least significant byte
57
57
* and ADXL345_REG_DATA(X0/Y0/Z0) + 1 the most significant byte
58
58
*/
59
-
ret = regmap_bulk_read(data->regmap,
59
+
ret = regmap_bulk_read(st->regmap,
60
60
ADXL345_REG_DATA_AXIS(chan->address),
61
61
&accel, sizeof(accel));
62
62
if (ret < 0)
···
66
66
return IIO_VAL_INT;
67
67
case IIO_CHAN_INFO_SCALE:
68
68
*val = 0;
69
-
*val2 = data->info->uscale;
69
+
*val2 = st->info->uscale;
70
70
return IIO_VAL_INT_PLUS_MICRO;
71
71
case IIO_CHAN_INFO_CALIBBIAS:
72
-
ret = regmap_read(data->regmap,
72
+
ret = regmap_read(st->regmap,
73
73
ADXL345_REG_OFS_AXIS(chan->address), ®val);
74
74
if (ret < 0)
75
75
return ret;
···
81
81
82
82
return IIO_VAL_INT;
83
83
case IIO_CHAN_INFO_SAMP_FREQ:
84
-
ret = regmap_read(data->regmap, ADXL345_REG_BW_RATE, ®val);
84
+
ret = regmap_read(st->regmap, ADXL345_REG_BW_RATE, ®val);
85
85
if (ret < 0)
86
86
return ret;
87
87
···
99
99
struct iio_chan_spec const *chan,
100
100
int val, int val2, long mask)
101
101
{
102
-
struct adxl345_data *data = iio_priv(indio_dev);
102
+
struct adxl345_state *st = iio_priv(indio_dev);
103
103
s64 n;
104
104
105
105
switch (mask) {
···
108
108
* 8-bit resolution at +/- 2g, that is 4x accel data scale
109
109
* factor
110
110
*/
111
-
return regmap_write(data->regmap,
111
+
return regmap_write(st->regmap,
112
112
ADXL345_REG_OFS_AXIS(chan->address),
113
113
val / 4);
114
114
case IIO_CHAN_INFO_SAMP_FREQ:
115
115
n = div_s64(val * NANOHZ_PER_HZ + val2,
116
116
ADXL345_BASE_RATE_NANO_HZ);
117
117
118
-
return regmap_update_bits(data->regmap, ADXL345_REG_BW_RATE,
118
+
return regmap_update_bits(st->regmap, ADXL345_REG_BW_RATE,
119
119
ADXL345_BW_RATE,
120
120
clamp_val(ilog2(n), 0,
121
121
ADXL345_BW_RATE));
···
180
180
int adxl345_core_probe(struct device *dev, struct regmap *regmap,
181
181
int (*setup)(struct device*, struct regmap*))
182
182
{
183
-
struct adxl345_data *data;
183
+
struct adxl345_state *st;
184
184
struct iio_dev *indio_dev;
185
185
u32 regval;
186
186
unsigned int data_format_mask = (ADXL345_DATA_FORMAT_RANGE |
···
189
189
ADXL345_DATA_FORMAT_SELF_TEST);
190
190
int ret;
191
191
192
-
indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
192
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
193
193
if (!indio_dev)
194
194
return -ENOMEM;
195
195
196
-
data = iio_priv(indio_dev);
197
-
data->regmap = regmap;
198
-
data->info = device_get_match_data(dev);
199
-
if (!data->info)
196
+
st = iio_priv(indio_dev);
197
+
st->regmap = regmap;
198
+
st->info = device_get_match_data(dev);
199
+
if (!st->info)
200
200
return -ENODEV;
201
201
202
-
indio_dev->name = data->info->name;
202
+
indio_dev->name = st->info->name;
203
203
indio_dev->info = &adxl345_info;
204
204
indio_dev->modes = INDIO_DIRECT_MODE;
205
205
indio_dev->channels = adxl345_channels;
···
207
207
208
208
if (setup) {
209
209
/* Perform optional initial bus specific configuration */
210
-
ret = setup(dev, data->regmap);
210
+
ret = setup(dev, st->regmap);
211
211
if (ret)
212
212
return ret;
213
213
214
214
/* Enable full-resolution mode */
215
-
ret = regmap_update_bits(data->regmap, ADXL345_REG_DATA_FORMAT,
215
+
ret = regmap_update_bits(st->regmap, ADXL345_REG_DATA_FORMAT,
216
216
data_format_mask,
217
217
ADXL345_DATA_FORMAT_FULL_RES);
218
218
if (ret)
···
221
221
222
222
} else {
223
223
/* Enable full-resolution mode (init all data_format bits) */
224
-
ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT,
224
+
ret = regmap_write(st->regmap, ADXL345_REG_DATA_FORMAT,
225
225
ADXL345_DATA_FORMAT_FULL_RES);
226
226
if (ret)
227
227
return dev_err_probe(dev, ret,
228
228
"Failed to set data range\n");
229
229
}
230
230
231
-
ret = regmap_read(data->regmap, ADXL345_REG_DEVID, ®val);
231
+
ret = regmap_read(st->regmap, ADXL345_REG_DEVID, ®val);
232
232
if (ret < 0)
233
233
return dev_err_probe(dev, ret, "Error reading device ID\n");
234
234
···
237
237
regval, ADXL345_DEVID);
238
238
239
239
/* Enable measurement mode */
240
-
ret = adxl345_powerup(data->regmap);
240
+
ret = adxl345_powerup(st->regmap);
241
241
if (ret < 0)
242
242
return dev_err_probe(dev, ret, "Failed to enable measurement mode\n");
243
243
244
-
ret = devm_add_action_or_reset(dev, adxl345_powerdown, data->regmap);
244
+
ret = devm_add_action_or_reset(dev, adxl345_powerdown, st->regmap);
245
245
if (ret < 0)
246
246
return ret;
247
247