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>

9 files changed, 28 insertions, 196 deletions

diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 21888994a4..a6d0ef0b64 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -33,9 +33,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void kbc1100_pnp_set_resources(device_t dev);
-static void kbc1100_pnp_enable_resources(device_t dev);
-static void kbc1100_pnp_enable(device_t dev);
 static void kbc1100_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -53,9 +50,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
   .read_resources   = pnp_read_resources,
-  .set_resources    = kbc1100_pnp_set_resources,
-  .enable_resources = kbc1100_pnp_enable_resources,
-  .enable           = kbc1100_pnp_enable,
+  .set_resources    = pnp_set_resources,
+  .enable_resources = pnp_enable_resources,
+  .enable           = pnp_alt_enable,
   .init             = kbc1100_init,
   .ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -69,21 +66,6 @@ static void enable_dev(device_t dev)
   pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
-static void kbc1100_pnp_set_resources(device_t dev)
-{
-  pnp_set_resources(dev);
-}
-
-static void kbc1100_pnp_enable_resources(device_t dev)
-{
-  pnp_enable_resources(dev);
-}
-
-static void kbc1100_pnp_enable(device_t dev)
-{
-  pnp_alt_enable(dev);
-}
-
 static void kbc1100_init(device_t dev)
 {
   struct superio_smsc_kbc1100_config *conf = dev->chip_info;
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 051b339e35..d06f09457e 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -37,9 +37,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void lpc47b272_pnp_set_resources(device_t dev);
-static void lpc47b272_pnp_enable_resources(device_t dev);
-static void lpc47b272_pnp_enable(device_t dev);
 static void lpc47b272_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -58,9 +55,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = lpc47b272_pnp_set_resources,
-	.enable_resources = lpc47b272_pnp_enable_resources,
-	.enable           = lpc47b272_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = lpc47b272_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -87,27 +84,6 @@ static void enable_dev(device_t dev)
 }
 
 /**
- * Configure the specified Super I/O device with the resources (I/O space,
- * etc.) that have been allocated for it.
- *
- * @param dev Pointer to structure describing a Super I/O device.
- */
-static void lpc47b272_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void lpc47b272_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void lpc47b272_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
-/**
  * Initialize the specified Super I/O device.
  *
  * Devices other than COM ports and the keyboard controller are ignored.
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,
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 0b55110190..925defa526 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -36,9 +36,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void lpc47m10x_pnp_set_resources(device_t dev);
-static void lpc47m10x_pnp_enable_resources(device_t dev);
-static void lpc47m10x_pnp_enable(device_t dev);
 static void lpc47m10x_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -57,9 +54,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = lpc47m10x_pnp_set_resources,
-	.enable_resources = lpc47m10x_pnp_enable_resources,
-	.enable           = lpc47m10x_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = lpc47m10x_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -86,27 +83,6 @@ static void enable_dev(device_t dev)
 }
 
 /**
- * Configure the specified Super I/O device with the resources (I/O space,
- * etc.) that have been allocated for it.
- *
- * @param dev Pointer to structure describing a Super I/O device.
- */
-static void lpc47m10x_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void lpc47m10x_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void lpc47m10x_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
-/**
  * Initialize the specified Super I/O device.
  *
  * Devices other than COM ports and the keyboard controller are ignored.
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index bcccb7a636..a3b8fc5e73 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -33,9 +33,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void lpc47m15x_pnp_set_resources(device_t dev);
-static void lpc47m15x_pnp_enable_resources(device_t dev);
-static void lpc47m15x_pnp_enable(device_t dev);
 static void lpc47m15x_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -53,9 +50,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = lpc47m15x_pnp_set_resources,
-	.enable_resources = lpc47m15x_pnp_enable_resources,
-	.enable           = lpc47m15x_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = lpc47m15x_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -74,21 +71,6 @@ static void enable_dev(device_t dev)
 			   ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
-static void lpc47m15x_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void lpc47m15x_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void lpc47m15x_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
 static void lpc47m15x_init(device_t dev)
 {
 	struct superio_smsc_lpc47m15x_config *conf = dev->chip_info;
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index d08de2fbc9..0385b26b90 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -43,21 +43,6 @@ static void pnp_exit_conf_state(device_t dev)
 	outb(0xaa, dev->path.pnp.port);
 }
 
-static void mec1308_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void mec1308_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void mec1308_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
 static void mec1308_init(device_t dev)
 {
 	struct superio_smsc_mec1308_config *conf = dev->chip_info;
@@ -83,9 +68,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = mec1308_pnp_set_resources,
-	.enable_resources = mec1308_pnp_enable_resources,
-	.enable           = mec1308_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = mec1308_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index c6daa18d9a..254b8386ba 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -33,9 +33,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void sch4037_pnp_set_resources(device_t dev);
-static void sch4037_pnp_enable_resources(device_t dev);
-static void sch4037_pnp_enable(device_t dev);
 static void sch4037_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -53,9 +50,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = sch4037_pnp_set_resources,
-	.enable_resources = sch4037_pnp_enable_resources,
-	.enable           = sch4037_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = sch4037_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -70,21 +67,6 @@ static void enable_dev(device_t dev)
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
-static void sch4037_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void sch4037_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void sch4037_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
 static void sch4037_init(device_t dev)
 {
 	struct superio_smsc_sch4037_config *conf = dev->chip_info;
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 834fd492f4..2ce2af2787 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -33,9 +33,6 @@
 
 /* Forward declarations */
 static void enable_dev(device_t dev);
-static void sio1036_pnp_set_resources(device_t dev);
-static void sio1036_pnp_enable_resources(device_t dev);
-static void sio1036_pnp_enable(device_t dev);
 static void sio1036_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
@@ -53,9 +50,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = sio1036_pnp_set_resources,
-	.enable_resources = sio1036_pnp_enable_resources,
-	.enable           = sio1036_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = sio1036_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };
@@ -69,21 +66,6 @@ static void enable_dev(device_t dev)
 	pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
-static void sio1036_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-static void sio1036_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-static void sio1036_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
 static void sio1036_init(device_t dev)
 {
 	struct superio_smsc_sio1036_config *conf = dev->chip_info;
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 9af67a1c02..d45a9671c1 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -169,29 +169,6 @@ static void smsc_pnp_exit_conf_state(device_t dev)
 	outb(0xaa, dev->path.pnp.port);
 }
 
-/** Wrapper for pnp_set_resources(). */
-static void smsc_pnp_set_resources(device_t dev)
-{
-	pnp_set_resources(dev);
-}
-
-/** Wrapper for pnp_enable_resources(). */
-static void smsc_pnp_enable_resources(device_t dev)
-{
-	pnp_enable_resources(dev);
-}
-
-/**
- * If so configured, enable the specified device, otherwise
- * explicitly disable it.
- *
- * @param dev The device to use.
- */
-static void smsc_pnp_enable(device_t dev)
-{
-	pnp_alt_enable(dev);
-}
-
 /**
  * Initialize those logical devices which need a special init.
  *
@@ -230,9 +207,9 @@ static const struct pnp_mode_ops pnp_conf_mode_ops = {
 /** Standard device operations. */
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = smsc_pnp_set_resources,
-	.enable_resources = smsc_pnp_enable_resources,
-	.enable           = smsc_pnp_enable,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_alt_enable,
 	.init             = smsc_init,
 	.ops_pnp_mode     = &pnp_conf_mode_ops,
 };