Skip to content

drivers: i2c: Call correct I2C device definition macros #81354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashif merged 1 commit into from
Nov 19, 2024
Merged

drivers: i2c: Call correct I2C device definition macros #81354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/i2c/gpio_i2c_switch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
.gpio = GPIO_DT_SPEC_GET(DT_DRV_INST(inst), gpios), \
}; \
\
DEVICE_DT_INST_DEFINE(inst, gpio_i2c_switch_init, device_pm_control_nop, \
I2C_DEVICE_DT_INST_DEFINE(inst, gpio_i2c_switch_init, device_pm_control_nop, \
&gpio_i2c_switch_dev_data_##inst, &gpio_i2c_switch_dev_cfg_##inst, \
POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &gpio_i2c_switch_api_funcs);

Check notice on line 97 in drivers/i2c/gpio_i2c_switch.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/i2c/gpio_i2c_switch.c:97 
-			      &gpio_i2c_switch_dev_data_##inst, &gpio_i2c_switch_dev_cfg_##inst,   \
-			      POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &gpio_i2c_switch_api_funcs);
+				  &gpio_i2c_switch_dev_data_##inst,                                \
+				  &gpio_i2c_switch_dev_cfg_##inst, POST_KERNEL,                    \
+				  CONFIG_I2C_INIT_PRIORITY, &gpio_i2c_switch_api_funcs);
DT_INST_FOREACH_STATUS_OKAY(DEFINE_GPIO_I2C_SWITCH)
2 changes: 1 addition & 1 deletion drivers/i2c/i2c_ene_kb1200.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@
.fsmbm = (struct fsmbm_regs *)DT_INST_REG_ADDR(inst), \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst), \
}; \
DEVICE_DT_INST_DEFINE(inst, &i2c_kb1200_init, NULL, &i2c_kb1200_data_##inst, \
I2C_DEVICE_DT_INST_DEFINE(inst, &i2c_kb1200_init, NULL, &i2c_kb1200_data_##inst, \
&i2c_kb1200_config_##inst, PRE_KERNEL_1, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_kb1200_api);

Check notice on line 358 in drivers/i2c/i2c_ene_kb1200.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/i2c/i2c_ene_kb1200.c:358 
-			      &i2c_kb1200_config_##inst, PRE_KERNEL_1,                             \
-			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_kb1200_api);
+				  &i2c_kb1200_config_##inst, PRE_KERNEL_1,                         \
+				  CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_kb1200_api);
DT_INST_FOREACH_STATUS_OKAY(I2C_KB1200_DEVICE)
5 changes: 3 additions & 2 deletions drivers/i2c/i2c_mchp_mss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,8 @@
.clock_freq = DT_INST_PROP(n, clock_frequency), \
}; \
\
DEVICE_DT_INST_DEFINE(n, mss_i2c_init_##n, NULL, &mss_i2c_data_##n, &mss_i2c_config_##n, \
PRE_KERNEL_1, CONFIG_I2C_INIT_PRIORITY, &mss_i2c_driver_api);
I2C_DEVICE_DT_INST_DEFINE(n, mss_i2c_init_##n, NULL, &mss_i2c_data_##n, \
&mss_i2c_config_##n, PRE_KERNEL_1, CONFIG_I2C_INIT_PRIORITY, \
&mss_i2c_driver_api);

Check notice on line 388 in drivers/i2c/i2c_mchp_mss.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/i2c/i2c_mchp_mss.c:388 
-			&mss_i2c_config_##n, PRE_KERNEL_1, CONFIG_I2C_INIT_PRIORITY,               \
-			&mss_i2c_driver_api);
+				  &mss_i2c_config_##n, PRE_KERNEL_1, CONFIG_I2C_INIT_PRIORITY,     \
+				  &mss_i2c_driver_api);
DT_INST_FOREACH_STATUS_OKAY(MSS_I2C_INIT)
2 changes: 1 addition & 1 deletion drivers/i2c/i2c_sc18im704.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@
.i2c_config = I2C_MODE_CONTROLLER | (I2C_SPEED_STANDARD << I2C_SPEED_SHIFT), \
}; \
\
DEVICE_DT_INST_DEFINE(n, i2c_sc18im_init, NULL, \
I2C_DEVICE_DT_INST_DEFINE(n, i2c_sc18im_init, NULL, \
&i2c_sc18im_data_##n, &i2c_sc18im_config_##n, \
POST_KERNEL, CONFIG_I2C_SC18IM704_INIT_PRIORITY, \
&i2c_sc18im_driver_api);

Check notice on line 347 in drivers/i2c/i2c_sc18im704.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/i2c/i2c_sc18im704.c:347 
-#define I2C_SC18IM_DEFINE(n)									\
-												\
-	static const struct i2c_sc18im_config i2c_sc18im_config_##n = {				\
-		.bus = DEVICE_DT_GET(DT_BUS(DT_INST_PARENT(n))),				\
-		.bus_speed = DT_PROP_OR(DT_INST_PARENT(n), target_speed, 9600),			\
-		.reset_gpios = GPIO_DT_SPEC_GET_OR(DT_INST_PARENT(n), reset_gpios, {0}),	\
-	};											\
-	static struct i2c_sc18im_data i2c_sc18im_data_##n = {					\
-		.i2c_config = I2C_MODE_CONTROLLER | (I2C_SPEED_STANDARD << I2C_SPEED_SHIFT),	\
-	};											\
-												\
-	I2C_DEVICE_DT_INST_DEFINE(n, i2c_sc18im_init, NULL,					\
-			      &i2c_sc18im_data_##n, &i2c_sc18im_config_##n,			\
-			      POST_KERNEL, CONFIG_I2C_SC18IM704_INIT_PRIORITY,			\
-			      &i2c_sc18im_driver_api);
+#define I2C_SC18IM_DEFINE(n)                                                                       \
+                                                                                                   \
+	static const struct i2c_sc18im_config i2c_sc18im_config_##n = {                            \
+		.bus = DEVICE_DT_GET(DT_BUS(DT_INST_PARENT(n))),                                   \
+		.bus_speed = DT_PROP_OR(DT_INST_PARENT(n), target_speed, 9600),                    \
+		.reset_gpios = GPIO_DT_SPEC_GET_OR(DT_INST_PARENT(n), reset_gpios, {0}),           \
+	};                                                                                         \
+	static struct i2c_sc18im_data i2c_sc18im_data_##n = {                                      \
+		.i2c_config = I2C_MODE_CONTROLLER | (I2C_SPEED_STANDARD << I2C_SPEED_SHIFT),       \
+	};                                                                                         \
+                                                                                                   \
+	I2C_DEVICE_DT_INST_DEFINE(n, i2c_sc18im_init, NULL, &i2c_sc18im_data_##n,                  \
+				  &i2c_sc18im_config_##n, POST_KERNEL,                             \
+				  CONFIG_I2C_SC18IM704_INIT_PRIORITY, &i2c_sc18im_driver_api);
DT_INST_FOREACH_STATUS_OKAY(I2C_SC18IM_DEFINE)
Loading