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>
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 2188899..a6d0ef0 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 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 @@
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;