8 files changed, 22 insertions, 22 deletions
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index 2e83b4ccc4..4bf6727afc 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -132,7 +132,7 @@ static u8 ec_io_read(u16 addr)
 */
 
 #ifndef __SMM__
-static void ene932_init(device_t dev)
+static void ene932_init(struct device *dev)
 {
 	if (!dev->enabled)
 		return;
@@ -143,13 +143,13 @@ static void ene932_init(device_t dev)
 }
 
 
-static void ene932_read_resources(device_t dev)
+static void ene932_read_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
 
 
-static void ene932_enable_resources(device_t dev)
+static void ene932_enable_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
@@ -164,7 +164,7 @@ static struct pnp_info pnp_dev_info[] = {
         { &ops, 0, 0, { 0, 0 }, }
 };
 
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
 {
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
 			   pnp_dev_info);
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 4cd30f3469..5344716d47 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -137,7 +137,7 @@ int google_chromeec_command(struct chromeec_command *cec_command)
 #ifndef __PRE_RAM__
 
 #ifndef __SMM__
-static void lpc_ec_init(device_t dev)
+static void lpc_ec_init(struct device *dev)
 {
 	if (!dev->enabled)
 		return;
@@ -146,12 +146,12 @@ static void lpc_ec_init(device_t dev)
 	google_chromeec_init();
 }
 
-static void lpc_ec_read_resources(device_t dev)
+static void lpc_ec_read_resources(struct device *dev)
 {
 	/* Nothing, but this function avoids an error on serial console. */
 }
 
-static void lpc_ec_enable_resources(device_t dev)
+static void lpc_ec_enable_resources(struct device *dev)
 {
 	/* Nothing, but this function avoids an error on serial console. */
 }
@@ -166,7 +166,7 @@ static struct pnp_info pnp_dev_info[] = {
 	{ &ops, 0, 0, { 0, 0 }, }
 };
 
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
 {
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
 			   pnp_dev_info);
diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c
index 925b7ea524..7827a1d409 100644
--- a/src/ec/kontron/it8516e/ec.c
+++ b/src/ec/kontron/it8516e/ec.c
@@ -211,7 +211,7 @@ static void it8516e_set_fan_from_options(const config_t *const config,
 	}
 }
 
-static void it8516e_pm2_init(const device_t dev)
+static void it8516e_pm2_init(struct device *dev)
 {
 	const config_t *const config = dev->chip_info;
 
@@ -251,7 +251,7 @@ static struct pnp_info it8516e_dev_infos[] = {
 	{ NULL,             IT8516E_LDN_PM3,   PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x07ff, }, { 0x07ff, }, },
 };
 
-static void it8516e_enable(const device_t dev)
+static void it8516e_enable(struct device *dev)
 {
 	pnp_enable_devices(dev, &pnp_ops,
 			   ARRAY_SIZE(it8516e_dev_infos), it8516e_dev_infos);
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 79ef3cdeeb..13b048390a 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -167,7 +167,7 @@ u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len)
 	return i;
 }
 
-static void h8_smbios_strings(device_t dev, struct smbios_type11 *t)
+static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t)
 {
 	char tpec[] = "IBM ThinkPad Embedded Controller -[                 ]-";
 
@@ -180,7 +180,7 @@ struct device_operations h8_dev_ops = {
 	.get_smbios_strings = h8_smbios_strings
 };
 
-static void h8_enable(device_t dev)
+static void h8_enable(struct device *dev)
 {
 	struct ec_lenovo_h8_config *conf = dev->chip_info;
 	u8 val, tmp;
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index cb0e27b89b..f67fbda49e 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -102,7 +102,7 @@ void pmh7_register_write(int reg, int val)
 
 #ifndef __PRE_RAM__
 #ifndef __SMM__
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
 {
 	struct ec_lenovo_pmh7_config *conf = dev->chip_info;
 	struct resource *resource;
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index f0a2308e8a..dcd9c4af05 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -141,7 +141,7 @@ static void ene_kb3940q_log_events(void)
 #endif
 }
 
-static void ene_kb3940q_init(device_t dev)
+static void ene_kb3940q_init(struct device *dev)
 {
 	if (!dev->enabled)
 		return;
@@ -153,13 +153,13 @@ static void ene_kb3940q_init(device_t dev)
 }
 
 
-static void ene_kb3940q_read_resources(device_t dev)
+static void ene_kb3940q_read_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
 
 
-static void ene_kb3940q_enable_resources(device_t dev)
+static void ene_kb3940q_enable_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
@@ -174,7 +174,7 @@ static struct pnp_info pnp_dev_info[] = {
         { &ops, 0, 0, { 0, 0 }, }
 };
 
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
 {
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
 			   pnp_dev_info);
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index b9cb68f088..cd976e6cc0 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -156,7 +156,7 @@ void ec_it8518_enable_wake_events(void)
 }
 
 #ifndef __SMM__
-static void it8518_init(device_t dev)
+static void it8518_init(struct device *dev)
 {
 	if (!dev->enabled)
 		return;
@@ -166,13 +166,13 @@ static void it8518_init(device_t dev)
 }
 
 
-static void it8518_read_resources(device_t dev)
+static void it8518_read_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
 
 
-static void it8518_enable_resources(device_t dev)
+static void it8518_enable_resources(struct device *dev)
 {
 	/* This function avoids an error on serial console. */
 }
@@ -187,7 +187,7 @@ static struct pnp_info pnp_dev_info[] = {
         { &ops, 0, 0, { 0, 0 }, }
 };
 
-static void enable_dev(device_t dev)
+static void enable_dev(struct device *dev)
 {
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
 			   pnp_dev_info);
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c
index 4d3b30a118..0a7c4ae5a2 100644
--- a/src/ec/smsc/mec1308/ec.c
+++ b/src/ec/smsc/mec1308/ec.c
@@ -121,7 +121,7 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
 }
 
 #if !defined(__PRE_RAM__) && !defined(__SMM__)
-static void mec1308_enable(device_t dev)
+static void mec1308_enable(struct device *dev)
 {
 	struct ec_smsc_mec1308_config *conf = dev->chip_info;