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/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index d742112..1a83b3d 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -65,21 +65,6 @@
}
}
-static void w83627dhg_pnp_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83627dhg_pnp_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
-static void w83627dhg_pnp_enable(device_t dev)
-{
- pnp_alt_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = pnp_enter_ext_func_mode,
.exit_conf_mode = pnp_exit_ext_func_mode,
@@ -87,9 +72,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83627dhg_pnp_set_resources,
- .enable_resources = w83627dhg_pnp_enable_resources,
- .enable = w83627dhg_pnp_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
.init = w83627dhg_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index a94c4c00..631105b 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -127,11 +127,6 @@
}
}
-static void w83627ehg_pnp_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
static void w83627ehg_pnp_enable_resources(device_t dev)
{
pnp_enable_resources(dev);
@@ -146,11 +141,6 @@
pnp_exit_conf_mode(dev);
}
-static void w83627ehg_pnp_enable(device_t dev)
-{
- pnp_alt_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = pnp_enter_ext_func_mode,
.exit_conf_mode = pnp_exit_ext_func_mode,
@@ -158,9 +148,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83627ehg_pnp_set_resources,
+ .set_resources = pnp_set_resources,
.enable_resources = w83627ehg_pnp_enable_resources,
- .enable = w83627ehg_pnp_enable,
+ .enable = pnp_alt_enable,
.init = w83627ehg_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 625f149..4d68c35 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -134,11 +134,6 @@
}
}
-static void w83627hf_pnp_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
static void w83627hf_pnp_enable_resources(device_t dev)
{
pnp_enable_resources(dev);
@@ -153,11 +148,6 @@
pnp_exit_conf_mode(dev);
}
-static void w83627hf_pnp_enable(device_t dev)
-{
- pnp_alt_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = pnp_enter_ext_func_mode,
.exit_conf_mode = pnp_exit_ext_func_mode,
@@ -165,9 +155,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83627hf_pnp_set_resources,
+ .set_resources = pnp_set_resources,
.enable_resources = w83627hf_pnp_enable_resources,
- .enable = w83627hf_pnp_enable,
+ .enable = pnp_alt_enable,
.init = w83627hf_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 70d0c3d..f1c5603 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -55,21 +55,6 @@
}
}
-static void w83627thg_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83627thg_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
-static void w83627thg_enable(device_t dev)
-{
- pnp_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = w83627thg_enter_ext_func_mode,
.exit_conf_mode = w83627thg_exit_ext_func_mode,
@@ -77,9 +62,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83627thg_set_resources,
- .enable_resources = w83627thg_enable_resources,
- .enable = w83627thg_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_enable,
.init = w83627thg_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index adae491..d2cbdc9 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -101,21 +101,6 @@
}
}
-static void w83627uhg_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83627uhg_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
-static void w83627uhg_enable(device_t dev)
-{
- pnp_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = w83627uhg_enter_ext_func_mode,
.exit_conf_mode = w83627uhg_exit_ext_func_mode,
@@ -123,9 +108,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83627uhg_set_resources,
- .enable_resources = w83627uhg_enable_resources,
- .enable = w83627uhg_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_enable,
.init = w83627uhg_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 2dd4f4f..9431b34 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -81,21 +81,6 @@
}
}
-static void w83697hf_pnp_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83697hf_pnp_enable(device_t dev)
-{
- pnp_alt_enable(dev);
-}
-
-static void w83697hf_pnp_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = pnp_enter_ext_func_mode,
.exit_conf_mode = pnp_exit_ext_func_mode,
@@ -103,9 +88,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83697hf_pnp_set_resources,
- .enable_resources = w83697hf_pnp_enable_resources,
- .enable = w83697hf_pnp_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
.init = w83697hf_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index a88cbe5..8368839 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -54,21 +54,6 @@
}
}
-static void w83977f_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83977f_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
-static void w83977f_enable(device_t dev)
-{
- pnp_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = w83977f_enter_ext_func_mode,
.exit_conf_mode = w83977f_exit_ext_func_mode,
@@ -76,9 +61,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83977f_set_resources,
- .enable_resources = w83977f_enable_resources,
- .enable = w83977f_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_enable,
.init = w83977f_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 30c2917..ff55f5d 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -56,21 +56,6 @@
}
}
-static void w83977tf_set_resources(device_t dev)
-{
- pnp_set_resources(dev);
-}
-
-static void w83977tf_enable_resources(device_t dev)
-{
- pnp_enable_resources(dev);
-}
-
-static void w83977tf_enable(device_t dev)
-{
- pnp_enable(dev);
-}
-
static const struct pnp_mode_ops pnp_conf_mode_ops = {
.enter_conf_mode = w83977tf_enter_ext_func_mode,
.exit_conf_mode = w83977tf_exit_ext_func_mode,
@@ -78,9 +63,9 @@
static struct device_operations ops = {
.read_resources = pnp_read_resources,
- .set_resources = w83977tf_set_resources,
- .enable_resources = w83977tf_enable_resources,
- .enable = w83977tf_enable,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_enable,
.init = w83977tf_init,
.ops_pnp_mode = &pnp_conf_mode_ops,
};