From 7943fe61df9e72721a8ceddb0120e4826552d5f9 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Fri, 30 Oct 2009 02:08:07 +0000 Subject: Remove some warnings from the tyan s2895. Declare superio functions to be static and remove duplicates. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/superio/fintek/f71805f/superio.c | 6 +++--- src/superio/smsc/lpc47b272/superio.c | 13 ++++++------- src/superio/smsc/lpc47b397/superio.c | 6 +++--- src/superio/smsc/lpc47m10x/superio.c | 13 ++++++------- src/superio/smsc/lpc47m15x/superio.c | 12 ++++++------ src/superio/smsc/lpc47n217/superio.c | 28 ++++++++++++++-------------- src/superio/winbond/w83627dhg/superio.c | 6 +++--- src/superio/winbond/w83627ehg/superio.c | 6 +++--- src/superio/winbond/w83627hf/superio.c | 6 +++--- 9 files changed, 47 insertions(+), 49 deletions(-) (limited to 'src/superio') diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c index bffcd7399f..4df9afc9f9 100644 --- a/src/superio/fintek/f71805f/superio.c +++ b/src/superio/fintek/f71805f/superio.c @@ -60,21 +60,21 @@ static void f71805f_init(device_t dev) } } -void f71805f_pnp_set_resources(device_t dev) +static void f71805f_pnp_set_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_set_resources(dev); pnp_exit_conf_state(dev); } -void f71805f_pnp_enable_resources(device_t dev) +static void f71805f_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_enable_resources(dev); pnp_exit_conf_state(dev); } -void f71805f_pnp_enable(device_t dev) +static void f71805f_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index 80b0c233db..1a6a778537 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -38,10 +38,9 @@ // Forward declarations static void enable_dev(device_t dev); -void lpc47b272_pnp_set_resources(device_t dev); -void lpc47b272_pnp_set_resources(device_t dev); -void lpc47b272_pnp_enable_resources(device_t dev); -void lpc47b272_pnp_enable(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); @@ -96,21 +95,21 @@ static void enable_dev(device_t dev) // Description: Configure the specified Super I/O device with the resources // (I/O space, etc.) that have been allocated for it. // -void lpc47b272_pnp_set_resources(device_t dev) +static void lpc47b272_pnp_set_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_set_resources(dev); pnp_exit_conf_state(dev); } -void lpc47b272_pnp_enable_resources(device_t dev) +static void lpc47b272_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_enable_resources(dev); pnp_exit_conf_state(dev); } -void lpc47b272_pnp_enable(device_t dev) +static void lpc47b272_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index 5dc8e1f376..1849102dd1 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -74,7 +74,7 @@ static void lpc47b397_init(device_t dev) } -void lpc47b397_pnp_set_resources(device_t dev) +static void lpc47b397_pnp_set_resources(device_t dev) { pnp_enter_conf_state(dev); @@ -89,7 +89,7 @@ void lpc47b397_pnp_set_resources(device_t dev) } -void lpc47b397_pnp_enable_resources(device_t dev) +static void lpc47b397_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); @@ -112,7 +112,7 @@ void lpc47b397_pnp_enable_resources(device_t dev) } -void lpc47b397_pnp_enable(device_t dev) +static void lpc47b397_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index bbe6cc3e15..5bcb08dd26 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -37,10 +37,9 @@ // Forward declarations static void enable_dev(device_t dev); -void lpc47m10x_pnp_set_resources(device_t dev); -void lpc47m10x_pnp_set_resources(device_t dev); -void lpc47m10x_pnp_enable_resources(device_t dev); -void lpc47m10x_pnp_enable(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); @@ -94,21 +93,21 @@ static void enable_dev(device_t dev) // Description: Configure the specified Super I/O device with the resources // (I/O space, etc.) that have been allocated for it. // -void lpc47m10x_pnp_set_resources(device_t dev) +static void lpc47m10x_pnp_set_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_set_resources(dev); pnp_exit_conf_state(dev); } -void lpc47m10x_pnp_enable_resources(device_t dev) +static void lpc47m10x_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_enable_resources(dev); pnp_exit_conf_state(dev); } -void lpc47m10x_pnp_enable(device_t dev) +static void lpc47m10x_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index 80ee5c7e55..6851279525 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -34,9 +34,9 @@ // Forward declarations static void enable_dev(device_t dev); -void lpc47m15x_pnp_set_resources(device_t dev); -void lpc47m15x_pnp_enable_resources(device_t dev); -void lpc47m15x_pnp_enable(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); @@ -70,21 +70,21 @@ static void enable_dev(device_t dev) pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } -void lpc47m15x_pnp_set_resources(device_t dev) +static void lpc47m15x_pnp_set_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_set_resources(dev); pnp_exit_conf_state(dev); } -void lpc47m15x_pnp_enable_resources(device_t dev) +static void lpc47m15x_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); pnp_enable_resources(dev); pnp_exit_conf_state(dev); } -void lpc47m15x_pnp_enable(device_t dev) +static void lpc47m15x_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index f64ec73198..90a3be1a8c 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -39,16 +39,16 @@ // Forward declarations static void enable_dev(device_t dev); -void lpc47n217_pnp_set_resources(device_t dev); -void lpc47n217_pnp_enable_resources(device_t dev); -void lpc47n217_pnp_enable(device_t dev); +static void lpc47n217_pnp_set_resources(device_t dev); +static void lpc47n217_pnp_enable_resources(device_t dev); +static void lpc47n217_pnp_enable(device_t dev); static void lpc47n217_init(device_t dev); static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource); -void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase); -void lpc47n217_pnp_set_drq(device_t dev, unsigned drq); -void lpc47n217_pnp_set_irq(device_t dev, unsigned irq); -void lpc47n217_pnp_set_enable(device_t dev, int enable); +static void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase); +static void lpc47n217_pnp_set_drq(device_t dev, unsigned drq); +static void lpc47n217_pnp_set_irq(device_t dev, unsigned irq); +static void lpc47n217_pnp_set_enable(device_t dev, int enable); static void pnp_enter_conf_state(device_t dev); static void pnp_exit_conf_state(device_t dev); @@ -98,7 +98,7 @@ static void enable_dev(device_t dev) // Description: Configure the specified Super I/O device with the resources // (I/O space, etc.) that have been allocate for it. // -void lpc47n217_pnp_set_resources(device_t dev) +static void lpc47n217_pnp_set_resources(device_t dev) { int i; @@ -114,7 +114,7 @@ void lpc47n217_pnp_set_resources(device_t dev) pnp_exit_conf_state(dev); } -void lpc47n217_pnp_enable_resources(device_t dev) +static void lpc47n217_pnp_enable_resources(device_t dev) { pnp_enter_conf_state(dev); @@ -125,7 +125,7 @@ void lpc47n217_pnp_enable_resources(device_t dev) pnp_exit_conf_state(dev); } -void lpc47n217_pnp_enable(device_t dev) +static void lpc47n217_pnp_enable(device_t dev) { pnp_enter_conf_state(dev); @@ -207,7 +207,7 @@ static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource) report_resource_stored(dev, resource, ""); } -void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase) +static void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase) { ASSERT(!(iobase & 0x3)); @@ -230,7 +230,7 @@ void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase) } } -void lpc47n217_pnp_set_drq(device_t dev, unsigned drq) +static void lpc47n217_pnp_set_drq(device_t dev, unsigned drq) { if (dev->path.pnp.device == LPC47N217_PP) { const uint8_t PP_DMA_MASK = 0x0F; @@ -246,7 +246,7 @@ void lpc47n217_pnp_set_drq(device_t dev, unsigned drq) } } -void lpc47n217_pnp_set_irq(device_t dev, unsigned irq) +static void lpc47n217_pnp_set_irq(device_t dev, unsigned irq) { uint8_t irq_config_register = 0; uint8_t irq_config_mask = 0; @@ -282,7 +282,7 @@ void lpc47n217_pnp_set_irq(device_t dev, unsigned irq) pnp_write_config(dev, irq_config_register, new_config); } -void lpc47n217_pnp_set_enable(device_t dev, int enable) +static void lpc47n217_pnp_set_enable(device_t dev, int enable) { uint8_t power_register = 0; uint8_t power_mask = 0; diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c index 232041ee4a..383f9a5681 100644 --- a/src/superio/winbond/w83627dhg/superio.c +++ b/src/superio/winbond/w83627dhg/superio.c @@ -64,21 +64,21 @@ static void w83627dhg_init(device_t dev) } } -void w83627dhg_pnp_set_resources(device_t dev) +static void w83627dhg_pnp_set_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_set_resources(dev); pnp_exit_ext_func_mode(dev); } -void w83627dhg_pnp_enable_resources(device_t dev) +static void w83627dhg_pnp_enable_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_enable_resources(dev); pnp_exit_ext_func_mode(dev); } -void w83627dhg_pnp_enable(device_t dev) +static void w83627dhg_pnp_enable(device_t dev) { if (!dev->enabled) return; diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index bd73e0e85d..e44a45ea85 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -137,14 +137,14 @@ static void w83627ehg_init(device_t dev) } } -void w83627ehg_pnp_set_resources(device_t dev) +static void w83627ehg_pnp_set_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_set_resources(dev); pnp_exit_ext_func_mode(dev); } -void w83627ehg_pnp_enable_resources(device_t dev) +static void w83627ehg_pnp_enable_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_enable_resources(dev); @@ -159,7 +159,7 @@ void w83627ehg_pnp_enable_resources(device_t dev) pnp_exit_ext_func_mode(dev); } -void w83627ehg_pnp_enable(device_t dev) +static void w83627ehg_pnp_enable(device_t dev) { if (!dev->enabled) { pnp_enter_ext_func_mode(dev); diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 123abc48fb..cd84a33530 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -129,7 +129,7 @@ static void w83627hf_init(device_t dev) } } -void w83627hf_pnp_set_resources(device_t dev) +static void w83627hf_pnp_set_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_set_resources(dev); @@ -137,7 +137,7 @@ void w83627hf_pnp_set_resources(device_t dev) } -void w83627hf_pnp_enable_resources(device_t dev) +static void w83627hf_pnp_enable_resources(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_enable_resources(dev); @@ -151,7 +151,7 @@ void w83627hf_pnp_enable_resources(device_t dev) } -void w83627hf_pnp_enable(device_t dev) +static void w83627hf_pnp_enable(device_t dev) { if (!dev->enabled) { -- cgit v1.2.3