superio: Use 'pnp_devfn_t' over 'device_t' in romstage component

The romstage component of Super I/O support is in fact written around
passing a lower and upper half packed integer. We currently have two
typedef's for this, 'device_t' and 'pnp_devfn_t'. We wish to make use of
'pnp_devfn_t' over 'device_t' as 'device_t' changes it's typedef in the
ramstage context and so is really a conflicting definition. This helps
solve problems down the road to having the 'real' 'device_t' definition
usable in romstage later.

This follows on from the rational given in:
c2956e7 device/pci_early.c: Mixes up variants of a typedefs to 'u32'

Change-Id: Ia9f238ebb944f9fe7b274621ee0c09a6de288a76
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6231
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)

4 files changed, 8 insertions, 8 deletions

diff --git a/src/superio/nuvoton/common/early_serial.c b/src/superio/nuvoton/common/early_serial.c
index 1cbcee8361..dbb0d1394d 100644
--- a/src/superio/nuvoton/common/early_serial.c
+++ b/src/superio/nuvoton/common/early_serial.c
@@ -49,7 +49,7 @@
 
 /* Enable configuration: pass entry key '0x87' into index port dev
  * two times. */
-static void pnp_enter_conf_state(device_t dev)
+static void pnp_enter_conf_state(pnp_devfn_t dev)
 {
 	u16 port = dev >> 8;
 	outb(NUVOTON_ENTRY_KEY, port);
@@ -57,14 +57,14 @@ static void pnp_enter_conf_state(device_t dev)
 }
 
 /* Disable configuration: pass exit key '0xAA' into index port dev. */
-static void pnp_exit_conf_state(device_t dev)
+static void pnp_exit_conf_state(pnp_devfn_t dev)
 {
 	u16 port = dev >> 8;
 	outb(NUVOTON_EXIT_KEY, port);
 }
 
 /* Bring up early serial debugging output before the RAM is initialized. */
-void nuvoton_enable_serial(device_t dev, u16 iobase)
+void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_enter_conf_state(dev);
 	pnp_set_logical_device(dev);
diff --git a/src/superio/nuvoton/common/nuvoton.h b/src/superio/nuvoton/common/nuvoton.h
index e9e8d4b2c9..43d80a9cad 100644
--- a/src/superio/nuvoton/common/nuvoton.h
+++ b/src/superio/nuvoton/common/nuvoton.h
@@ -25,6 +25,6 @@
 #include <arch/io.h>
 #include <stdint.h>
 
-void nuvoton_enable_serial(device_t dev, u16 iobase);
+void nuvoton_enable_serial(pnp_devfn_t dev, u16 iobase);
 
 #endif /* SUPERIO_NUVOTON_COMMON_ROMSTAGE_H */
diff --git a/src/superio/nuvoton/nct5104d/early_init.c b/src/superio/nuvoton/nct5104d/early_init.c
index c9a408ea64..96fac19529 100644
--- a/src/superio/nuvoton/nct5104d/early_init.c
+++ b/src/superio/nuvoton/nct5104d/early_init.c
@@ -28,7 +28,7 @@
 
 /* Enable configuration: pass entry key '0x87' into index port dev
  * two times. */
-static void pnp_enter_conf_state(device_t dev)
+static void pnp_enter_conf_state(pnp_devfn_t dev)
 {
 	u16 port = dev >> 8;
 	outb(NUVOTON_ENTRY_KEY, port);
@@ -36,14 +36,14 @@ static void pnp_enter_conf_state(device_t dev)
 }
 
 /* Disable configuration: pass exit key '0xAA' into index port dev. */
-static void pnp_exit_conf_state(device_t dev)
+static void pnp_exit_conf_state(pnp_devfn_t dev)
 {
 	u16 port = dev >> 8;
 	outb(NUVOTON_EXIT_KEY, port);
 }
 
 /* Route UARTD to pins 41-48 */
-void nct5104d_enable_uartd(device_t dev)
+void nct5104d_enable_uartd(pnp_devfn_t dev)
 {
 	u8 tmp;
 	u16 port = dev >> 8;
diff --git a/src/superio/nuvoton/nct5104d/nct5104d.h b/src/superio/nuvoton/nct5104d/nct5104d.h
index e4dcf3836b..5b12cc5b02 100644
--- a/src/superio/nuvoton/nct5104d/nct5104d.h
+++ b/src/superio/nuvoton/nct5104d/nct5104d.h
@@ -48,6 +48,6 @@
 #define NCT5104D_GPIO1 ((1 << 8) | NCT5104D_GPIO_V)
 #define NCT5104D_GPIO6 ((6 << 8) | NCT5104D_GPIO_V)
 
-void nct5104d_enable_uartd(device_t dev);
+void nct5104d_enable_uartd(pnp_devfn_t dev);
 
 #endif /* SUPERIO_NUVOTON_NCT5104D_H */