diff --git a/src/include/superio/conf_mode.h b/src/include/superio/conf_mode.h
index c49cae7e5a..9f7e3e619a 100644
--- a/src/include/superio/conf_mode.h
+++ b/src/include/superio/conf_mode.h
@@ -24,11 +24,11 @@
 #include <device/pnp.h>
 
 /* Common enter/exit implementations */
-void pnp_enter_conf_mode_55(device_t dev);
-void pnp_enter_conf_mode_8787(device_t dev);
-void pnp_exit_conf_mode_aa(device_t dev);
-void pnp_enter_conf_mode_870155aa(device_t dev);
-void pnp_exit_conf_mode_0202(device_t dev);
+void pnp_enter_conf_mode_55(struct device *dev);
+void pnp_enter_conf_mode_8787(struct device *dev);
+void pnp_exit_conf_mode_aa(struct device *dev);
+void pnp_enter_conf_mode_870155aa(struct device *dev);
+void pnp_exit_conf_mode_0202(struct device *dev);
 
 extern const struct pnp_mode_ops pnp_conf_mode_55_aa;
 extern const struct pnp_mode_ops pnp_conf_mode_8787_aa;
diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c
index f3e6277b22..271d4ef613 100644
--- a/src/superio/common/conf_mode.c
+++ b/src/superio/common/conf_mode.c
@@ -23,23 +23,23 @@
 
 /* Common enter/exit implementations */
 
-void pnp_enter_conf_mode_55(device_t dev)
+void pnp_enter_conf_mode_55(struct device *dev)
 {
 	outb(0x55, dev->path.pnp.port);
 }
 
-void pnp_enter_conf_mode_8787(device_t dev)
+void pnp_enter_conf_mode_8787(struct device *dev)
 {
 	outb(0x87, dev->path.pnp.port);
 	outb(0x87, dev->path.pnp.port);
 }
 
-void pnp_exit_conf_mode_aa(device_t dev)
+void pnp_exit_conf_mode_aa(struct device *dev)
 {
 	outb(0xaa, dev->path.pnp.port);
 }
 
-void pnp_enter_conf_mode_870155aa(device_t dev)
+void pnp_enter_conf_mode_870155aa(struct device *dev)
 {
 	outb(0x87, dev->path.pnp.port);
 	outb(0x01, dev->path.pnp.port);
@@ -51,7 +51,7 @@ void pnp_enter_conf_mode_870155aa(device_t dev)
 		outb(0x55, dev->path.pnp.port);
 }
 
-void pnp_exit_conf_mode_0202(device_t dev)
+void pnp_exit_conf_mode_0202(struct device *dev)
 {
 	outb(0x02, dev->path.pnp.port);
 	outb(0x02, dev->path.pnp.port + 1);