From 0b2ee9391079a5092eb99dce764e3836eeb92cd9 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 15 Jun 2013 19:58:35 +0200 Subject: 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 Reviewed-on: http://review.coreboot.org/3483 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Marc Jones Reviewed-by: Stefan Reinauer --- src/superio/smsc/lpc47m10x/superio.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'src/superio/smsc/lpc47m10x') 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, }; @@ -85,27 +82,6 @@ static void enable_dev(device_t dev) pnp_dev_info); } -/** - * 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. * -- cgit v1.2.3