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>

1 files changed, 4 insertions, 14 deletions

diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index e8c62cdc01..850b7bbbf4 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -78,11 +78,6 @@ static void lpc47b397_init(device_t dev)
 	}
 }
 
-static void lpc47b397_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
 static void lpc47b397_pnp_enable_resources(device_t dev)
 {
 	pnp_enable_resources(dev);
@@ -99,11 +94,6 @@ static void lpc47b397_pnp_enable_resources(device_t dev)
 	pnp_exit_conf_mode(dev);
 }
 
-static void lpc47b397_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,
@@ -111,9 +101,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = lpc47b397_pnp_set_resources,
+	.set_resources    = pnp_set_resources,
 	.enable_resources = lpc47b397_pnp_enable_resources,
-	.enable           = lpc47b397_pnp_enable,
+	.enable           = pnp_alt_enable,
 	.init             = lpc47b397_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -169,9 +159,9 @@ static struct smbus_bus_operations lops_smbus_bus = {
 
 static struct device_operations ops_hwm = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = lpc47b397_pnp_set_resources,
+	.set_resources    = pnp_set_resources,
 	.enable_resources = lpc47b397_pnp_enable_resources,
-	.enable           = lpc47b397_pnp_enable,
+	.enable           = pnp_alt_enable,
 	.init             = lpc47b397_init,
 	.scan_bus         = scan_static_bus,
 	.ops_smbus_bus    = &lops_smbus_bus,