pnp: Remove now plain wrappers for default PnP functions

After removing the enter()/exit() functions for configuration mode,
most wrappers for our standard PnP functions just call the underlying
default implementation.

Remove those with a little cocci:
    @ op_match @
    identifier op;
    identifier pnp_op =~ "^pnp_((alt_|)enable|(set|enable)_resources)$";
    type device_t;
    identifier dev;
    @@
     static void op(device_t dev) { pnp_op(dev); }

    @@
    identifier op_match.op;
    @@
    -op(...) {...}

    /* Three rules to match the alignment, hmmp... */
    @@
    identifier op_match.op, op_match.pnp_op;
    identifier ops;
    @@
     struct device_operations ops = {
    -        .set_resources    = op,
    +        .set_resources    = pnp_op,
     };

    @@
    identifier op_match.op, op_match.pnp_op;
    identifier ops;
    @@
     struct device_operations ops = {
    -        .enable_resources = op,
    +        .enable_resources = pnp_op,
     };

    @@
    identifier op_match.op, op_match.pnp_op;
    identifier ops;
    @@
     struct device_operations ops = {
    -        .enable           = op,
    +        .enable           = pnp_op,
     };

Change-Id: Idc0e52c7e3600a01f3b6a4e17763557b271b481e
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: http://review.coreboot.org/3483
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

6 files changed, 18 insertions, 108 deletions

diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index 3fb0c7632e..50c3355ce9 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -45,21 +45,6 @@ static void f71805f_init(device_t dev)
 	/* TODO: Might potentially need code for HWM or FDC etc. */
 }
 
-static void f71805f_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f71805f_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f71805f_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -67,9 +52,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f71805f_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 1f52ad7c8f..1e5b6ecd4d 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -46,21 +46,6 @@ static void f71859_init(device_t dev)
 	/* TODO: Might potentially need code for HWM or FDC etc. */
 }
 
-static void f71859_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f71859_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f71859_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -68,9 +53,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f71859_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 4aab676885..84a7ec1397 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -55,21 +55,6 @@ static void f71863fg_init(device_t dev)
 	}
 }
 
-static void f71863fg_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f71863fg_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f71863fg_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -77,9 +62,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f71863fg_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 8bc2b9496d..8db22a9f28 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -52,21 +52,6 @@ static void f71872_init(device_t dev)
 	}
 }
 
-static void f71872_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f71872_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f71872_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -74,9 +59,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f71872_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 5017505db4..8de8ae82e3 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -53,21 +53,6 @@ static void f71889_init(device_t dev)
 	}
 }
 
-static void f71889_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f71889_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f71889_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -75,9 +60,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f71889_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index ea322ea3c0..050602c96a 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -52,21 +52,6 @@ static void f81865f_init(device_t dev)
 	}
 }
 
-static void f81865f_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void f81865f_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void f81865f_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(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,
@@ -74,9 +59,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 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,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = f81865f_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };