driver: i2c: npcx: Convert drivers to new DT device macros

galak · galak · commit 4dd143f26f67 · 2021-01-05T13:19:32.000-06:00
Convert i2c npcx drivers from:

DEVICE_AND_API_INIT -&gt; DEVICE_DT_DEFINE
DEVICE_GET -&gt; DEVICE_DT_GET

Signed-off-by: Kumar Gala &lt;kumar.gala@linaro.org&gt;
diff --git a/drivers/i2c/i2c_npcx_controller.c b/drivers/i2c/i2c_npcx_controller.c
@@ -874,7 +874,7 @@ static int i2c_ctrl_init(const struct device *dev)
 		IRQ_CONNECT(DT_INST_IRQN(inst),		                       \
 			DT_INST_IRQ(inst, priority),                           \
 			i2c_ctrl_isr,                                          \
-			DEVICE_GET(i2c_ctrl_##inst),                           \
+			DEVICE_DT_INST_GET(inst),                              \
 			0);                                                    \
 		irq_enable(DT_INST_IRQN(inst));                                \
 									       \
@@ -893,8 +893,9 @@ static int i2c_ctrl_init(const struct device *dev)
 									       \
 	static struct i2c_ctrl_data i2c_ctrl_data_##inst;                      \
 									       \
-	DEVICE_AND_API_INIT(i2c_ctrl_##inst, DT_INST_LABEL(inst),              \
+	DEVICE_DT_INST_DEFINE(inst,                                            \
 			    NPCX_I2C_CTRL_INIT_FUNC(inst),                     \
+			    device_pm_control_nop,                             \
 			    &i2c_ctrl_data_##inst, &i2c_ctrl_cfg_##inst,       \
 			    PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,  \
 			    NULL);                                             \
diff --git a/drivers/i2c/i2c_npcx_port.c b/drivers/i2c/i2c_npcx_port.c
@@ -172,8 +172,9 @@ static const struct i2c_driver_api i2c_port_npcx_driver_api = {
 									       \
 	static struct i2c_npcx_port_data i2c_npcx_port_data_##inst;            \
 									       \
-	DEVICE_AND_API_INIT(i2c_npcx_port_##inst, DT_INST_LABEL(inst),         \
+	DEVICE_DT_INST_DEFINE(inst,                                            \
 			    NPCX_I2C_PORT_INIT_FUNC(inst),                     \
+			    device_pm_control_nop,                             \
 			    &i2c_npcx_port_data_##inst,                        \
 			    &i2c_npcx_port_cfg_##inst,                         \
 			    PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,  \

Original file line number	Diff line number	Diff line change
`@@ -874,7 +874,7 @@ static int i2c_ctrl_init(const struct device *dev)`
`874`	`874`	`IRQ_CONNECT(DT_INST_IRQN(inst), \`
`875`	`875`	`DT_INST_IRQ(inst, priority), \`
`876`	`876`	`i2c_ctrl_isr, \`
`877`		`- DEVICE_GET(i2c_ctrl_##inst), \`
	`877`	`+ DEVICE_DT_INST_GET(inst), \`
`878`	`878`	`0); \`
`879`	`879`	`irq_enable(DT_INST_IRQN(inst)); \`
`880`	`880`	`\`
`@@ -893,8 +893,9 @@ static int i2c_ctrl_init(const struct device *dev)`
`893`	`893`	`\`
`894`	`894`	`static struct i2c_ctrl_data i2c_ctrl_data_##inst; \`
`895`	`895`	`\`
`896`		`- DEVICE_AND_API_INIT(i2c_ctrl_##inst, DT_INST_LABEL(inst), \`
	`896`	`+ DEVICE_DT_INST_DEFINE(inst, \`
`897`	`897`	`NPCX_I2C_CTRL_INIT_FUNC(inst), \`
	`898`	`+ device_pm_control_nop, \`
`898`	`899`	`&i2c_ctrl_data_##inst, &i2c_ctrl_cfg_##inst, \`
`899`	`900`	`PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \`
`900`	`901`	`NULL); \`
Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,9 @@ static const struct i2c_driver_api i2c_port_npcx_driver_api = {`
`172`	`172`	`\`
`173`	`173`	`static struct i2c_npcx_port_data i2c_npcx_port_data_##inst; \`
`174`	`174`	`\`
`175`		`- DEVICE_AND_API_INIT(i2c_npcx_port_##inst, DT_INST_LABEL(inst), \`
	`175`	`+ DEVICE_DT_INST_DEFINE(inst, \`
`176`	`176`	`NPCX_I2C_PORT_INIT_FUNC(inst), \`
	`177`	`+ device_pm_control_nop, \`
`177`	`178`	`&i2c_npcx_port_data_##inst, \`
`178`	`179`	`&i2c_npcx_port_cfg_##inst, \`
`179`	`180`	`PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \`