6 files changed, 36 insertions, 36 deletions

diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index f46bd67dc4..3fb0c7632e 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -47,31 +47,31 @@ static void f71805f_init(device_t dev)
 
 static void f71805f_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71805f_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71805f_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f71805f_pnp_set_resources,
 	.enable_resources = f71805f_pnp_enable_resources,
 	.enable           = f71805f_pnp_enable,
 	.init             = f71805f_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index ed5da6ee30..1f52ad7c8f 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -48,31 +48,31 @@ static void f71859_init(device_t dev)
 
 static void f71859_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71859_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71859_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f71859_pnp_set_resources,
 	.enable_resources = f71859_pnp_enable_resources,
 	.enable           = f71859_pnp_enable,
 	.init             = f71859_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index d133745622..4aab676885 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -57,31 +57,31 @@ static void f71863fg_init(device_t dev)
 
 static void f71863fg_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71863fg_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71863fg_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f71863fg_pnp_set_resources,
 	.enable_resources = f71863fg_pnp_enable_resources,
 	.enable           = f71863fg_pnp_enable,
 	.init             = f71863fg_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 5a2719b403..8bc2b9496d 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -54,31 +54,31 @@ static void f71872_init(device_t dev)
 
 static void f71872_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71872_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71872_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f71872_pnp_set_resources,
 	.enable_resources = f71872_pnp_enable_resources,
 	.enable           = f71872_pnp_enable,
 	.init             = f71872_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 8daf7669a8..5017505db4 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -55,31 +55,31 @@ static void f71889_init(device_t dev)
 
 static void f71889_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71889_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f71889_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f71889_pnp_set_resources,
 	.enable_resources = f71889_pnp_enable_resources,
 	.enable           = f71889_pnp_enable,
 	.init             = f71889_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index eaae09ce09..ea322ea3c0 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -54,31 +54,31 @@ static void f81865f_init(device_t dev)
 
 static void f81865f_pnp_set_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_set_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f81865f_pnp_enable_resources(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_enable_resources(dev);
-	pnp_exit_conf_state(dev);
 }
 
 static void f81865f_pnp_enable(device_t dev)
 {
-	pnp_enter_conf_state(dev);
 	pnp_alt_enable(dev);
-	pnp_exit_conf_state(dev);
 }
 
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+	.enter_conf_mode  = pnp_enter_conf_state,
+	.exit_conf_mode   = pnp_exit_conf_state,
+};
+
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
 	.set_resources    = f81865f_pnp_set_resources,
 	.enable_resources = f81865f_pnp_enable_resources,
 	.enable           = f81865f_pnp_enable,
 	.init             = f81865f_init,
+	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
 
 static struct pnp_info pnp_dev_info[] = {