michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: Apply config_info rename everywhere

Browse source 
Via coccinelle:

@r_device_config@
struct device *D;
@@

D->
-	config_info
+	config

And 2 grep/sed rules for macros:

git grep -rlz 'dev)->config_info' |
	xargs -0 sed -i 's/dev)->config_info/dev)->config/g'

git grep -rlz 'dev->config_info' |
	xargs -0 sed -i 's/dev->config_info/dev->config/g'

Fixes #27397

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-05-28 20:44:16 +02:00 • committed by Carles Cufí
commit af6140cc0d
324 changed files with 1048 additions and 1071 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
View file

@ -26,7 +26,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power,
int x_en, int y_en, int z_en)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *config = dev->config_info;
const struct lsm9ds0_gyro_config *config = dev->config;
uint8_t state = (power << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_PD) |
(x_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_XEN) |
(y_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_YEN) |
@ -44,7 +44,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power,
static int lsm9ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *config = dev->config_info;
const struct lsm9ds0_gyro_config *config = dev->config;
if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr,
LSM9DS0_GYRO_REG_CTRL_REG4_G,
@ -85,7 +85,7 @@ static int lsm9ds0_gyro_set_fs(struct device *dev, int fs)
static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *config = dev->config_info;
const struct lsm9ds0_gyro_config *config = dev->config;
return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr,
LSM9DS0_GYRO_REG_CTRL_REG1_G,
@ -122,7 +122,7 @@ static int lsm9ds0_gyro_sample_fetch(struct device *dev,
enum sensor_channel chan)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *config = dev->config_info;
const struct lsm9ds0_gyro_config *config = dev->config;
uint8_t x_l, x_h, y_l, y_h, z_l, z_h;
__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
@ -262,7 +262,7 @@ static const struct sensor_driver_api lsm9ds0_gyro_api_funcs = {
static int lsm9ds0_gyro_init_chip(struct device *dev)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *config = dev->config_info;
const struct lsm9ds0_gyro_config *config = dev->config;
uint8_t chip_id;
if (lsm9ds0_gyro_power_ctrl(dev, 0, 0, 0, 0) < 0) {
@ -317,8 +317,7 @@ err_poweroff:
static int lsm9ds0_gyro_init(struct device *dev)
{
const struct lsm9ds0_gyro_config * const config =
dev->config_info;
const struct lsm9ds0_gyro_config * const config = dev->config;
struct lsm9ds0_gyro_data *data = dev->driver_data;
data->i2c_master = device_get_binding(config->i2c_master_dev_name);

6
drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
View file

@ -24,7 +24,7 @@ static inline void setup_drdy(struct device *dev,
bool enable)
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config *cfg = dev->config_info;
const struct lsm9ds0_gyro_config *cfg = dev->config;
gpio_pin_interrupt_configure(data->gpio_drdy,
cfg->gpio_drdy_int_pin,
@ -39,7 +39,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev,
{
struct lsm9ds0_gyro_data *data = dev->driver_data;
const struct lsm9ds0_gyro_config * const config =
dev->config_info;
dev->config;
uint8_t state;
if (trig->type == SENSOR_TRIG_DATA_READY) {
@ -100,7 +100,7 @@ static void lsm9ds0_gyro_thread_main(void *arg1, void *arg2, void *arg3)
int lsm9ds0_gyro_init_interrupt(struct device *dev)
{
const struct lsm9ds0_gyro_config * const config =
dev->config_info;
dev->config;
struct lsm9ds0_gyro_data *data = dev->driver_data;
k_sem_init(&data->sem, 0, UINT_MAX);