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)

12 files changed, 18 insertions, 18 deletions

diff --git a/src/superio/nsc/pc8374/early_init.c b/src/superio/nsc/pc8374/early_init.c
index d3f601df12db..a5e9b950e3cb 100644
--- a/src/superio/nsc/pc8374/early_init.c
+++ b/src/superio/nsc/pc8374/early_init.c
@@ -46,7 +46,7 @@ static void pc8374_enable(u16 iobase, u8 *init)
 	}
 }
 
-static void pc8374_enable_dev(device_t dev, u16 iobase)
+static void pc8374_enable_dev(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87309/early_serial.c b/src/superio/nsc/pc87309/early_serial.c
index 6e48e0c05f78..da0d5d7f1b41 100644
--- a/src/superio/nsc/pc87309/early_serial.c
+++ b/src/superio/nsc/pc87309/early_serial.c
@@ -22,7 +22,7 @@
 #include <device/pnp_def.h>
 #include "pc87309.h"
 
-void pc87309_enable_serial(device_t dev, u16 iobase)
+void pc87309_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
index 5f39b6e121d3..513576ed5302 100644
--- a/src/superio/nsc/pc87309/pc87309.h
+++ b/src/superio/nsc/pc87309/pc87309.h
@@ -34,6 +34,6 @@
 #include <arch/io.h>
 #include <stdint.h>
 
-void pc87309_enable_serial(device_t dev, u16 iobase);
+void pc87309_enable_serial(pnp_devfn_t dev, u16 iobase);
 
 #endif /* SUPERIO_NSC_PC87309_H */
diff --git a/src/superio/nsc/pc87351/early_serial.c b/src/superio/nsc/pc87351/early_serial.c
index c34538fd7cc9..a31f79cb8cef 100644
--- a/src/superio/nsc/pc87351/early_serial.c
+++ b/src/superio/nsc/pc87351/early_serial.c
@@ -22,7 +22,7 @@
 #include <arch/io.h>
 #include "pc87351.h"
 
-static void pc87351_enable_serial(device_t dev, u16 iobase)
+static void pc87351_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87360/early_serial.c b/src/superio/nsc/pc87360/early_serial.c
index da4abdb3307d..3deac3b4313b 100644
--- a/src/superio/nsc/pc87360/early_serial.c
+++ b/src/superio/nsc/pc87360/early_serial.c
@@ -22,7 +22,7 @@
 #include <arch/io.h>
 #include "pc87360.h"
 
-static void pc87360_enable_serial(device_t dev, u16 iobase)
+static void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87366/early_serial.c b/src/superio/nsc/pc87366/early_serial.c
index e173afd632c7..e663df602189 100644
--- a/src/superio/nsc/pc87366/early_serial.c
+++ b/src/superio/nsc/pc87366/early_serial.c
@@ -22,7 +22,7 @@
 #include <arch/io.h>
 #include "pc87366.h"
 
-static void pc87366_enable_serial(device_t dev, u16 iobase)
+static void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87392/early_serial.c b/src/superio/nsc/pc87392/early_serial.c
index 6e85fb96b82f..f1e5716acaad 100644
--- a/src/superio/nsc/pc87392/early_serial.c
+++ b/src/superio/nsc/pc87392/early_serial.c
@@ -21,7 +21,7 @@
 #include <arch/io.h>
 #include "pc87392.h"
 
-static void pc87392_enable_serial(device_t dev, u16 iobase)
+static void pc87392_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87417/early_init.c b/src/superio/nsc/pc87417/early_init.c
index d1870f9cba30..42f8cd15c850 100644
--- a/src/superio/nsc/pc87417/early_init.c
+++ b/src/superio/nsc/pc87417/early_init.c
@@ -23,13 +23,13 @@
 #include <arch/io.h>
 #include "pc87417.h"
 
-static void pc87417_disable_dev(device_t dev)
+static void pc87417_disable_dev(pnp_devfn_t dev)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
 }
 
-static void pc87417_enable_dev(device_t dev, u16 iobase)
+static void pc87417_enable_dev(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
@@ -37,7 +37,7 @@ static void pc87417_enable_dev(device_t dev, u16 iobase)
 	pnp_set_enable(dev, 1);
 }
 
-static void xbus_cfg(device_t dev)
+static void xbus_cfg(pnp_devfn_t dev)
 {
 	u8 i, data;
 	u16 xbus_index;
diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c
index 33bae7e071c9..42ba941cb726 100644
--- a/src/superio/nsc/pc87417/early_serial.c
+++ b/src/superio/nsc/pc87417/early_serial.c
@@ -23,7 +23,7 @@
 #include <arch/io.h>
 #include "pc87417.h"
 
-void pc87417_enable_serial(device_t dev, u16 iobase)
+void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
@@ -31,7 +31,7 @@ void pc87417_enable_serial(device_t dev, u16 iobase)
 	pnp_set_enable(dev, 1);
 }
 
-void pc87417_enable_dev(device_t dev)
+void pc87417_enable_dev(pnp_devfn_t dev)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 1);
diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h
index 73c1fbcd7629..e7d5413cc7c1 100644
--- a/src/superio/nsc/pc87417/pc87417.h
+++ b/src/superio/nsc/pc87417/pc87417.h
@@ -115,8 +115,8 @@
 #define PC87417_XWBCNF		0x16
 
 #if defined(__PRE_RAM__)
-void pc87417_enable_serial(device_t dev, u16 iobase);
-void pc87417_enable_dev(device_t dev);
+void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase);
+void pc87417_enable_dev(pnp_devfn_t dev);
 #endif
 
 #endif
diff --git a/src/superio/nsc/pc87427/early_init.c b/src/superio/nsc/pc87427/early_init.c
index 6df1b9f88d34..adaa868fa8b0 100644
--- a/src/superio/nsc/pc87427/early_init.c
+++ b/src/superio/nsc/pc87427/early_init.c
@@ -22,13 +22,13 @@
 #include <arch/io.h>
 #include "pc87427.h"
 
-static void pc87427_disable_dev(device_t dev)
+static void pc87427_disable_dev(pnp_devfn_t dev)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
 }
 
-static void pc87427_enable_dev(device_t dev, u16 iobase)
+static void pc87427_enable_dev(pnp_devfn_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
@@ -36,7 +36,7 @@ static void pc87427_enable_dev(device_t dev, u16 iobase)
 	pnp_set_enable(dev, 1);
 }
 
-static void xbus_cfg(device_t dev)
+static void xbus_cfg(pnp_devfn_t dev)
 {
 	u8 i, data;
 	u16 xbus_index;
diff --git a/src/superio/nsc/pc97317/early_serial.c b/src/superio/nsc/pc97317/early_serial.c
index 0c215611bc32..ad4301083827 100644
--- a/src/superio/nsc/pc97317/early_serial.c
+++ b/src/superio/nsc/pc97317/early_serial.c
@@ -25,7 +25,7 @@
 #define PM_BASE 0xe8
 
 /* The PC97317 needs clocks to be set up before the serial port will operate. */
-static void pc97317_enable_serial(device_t dev, u16 iobase)
+static void pc97317_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
 	/* Set base address of power management unit. */
 	pnp_set_logical_device(PM_DEV);