7 files changed, 26 insertions, 21 deletions
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index 60f7da06aa..6375805b9a 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -20,10 +20,10 @@
 #include <device/pci_ids.h>
 #include "bcm5785.h"
 
-void bcm5785_enable(device_t dev)
+void bcm5785_enable(struct device *dev)
 {
-	device_t sb_pci_main_dev;
-	device_t bus_dev;
+	struct device *sb_pci_main_dev;
+	struct device *bus_dev;
 	// unsigned index;
 
 	/* See if we are on the behind the pcix bridge */
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.h b/src/southbridge/broadcom/bcm5785/bcm5785.h
index 893a46ccc3..f1af15326c 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.h
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.h
@@ -20,7 +20,7 @@
 #include "chip.h"
 
 #ifndef __PRE_RAM__
-void bcm5785_enable(device_t dev);
+void bcm5785_enable(struct device *dev);
 #else
 void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
 #endif
diff --git a/src/southbridge/broadcom/bcm5785/ide.c b/src/southbridge/broadcom/bcm5785/ide.c
index a6bb20421c..9dd06042eb 100644
--- a/src/southbridge/broadcom/bcm5785/ide.c
+++ b/src/southbridge/broadcom/bcm5785/ide.c
@@ -21,7 +21,7 @@
 #include <device/pci_ops.h>
 #include "bcm5785.h"
 
-static void bcm5785_ide_read_resources(device_t dev)
+static void bcm5785_ide_read_resources(struct device *dev)
 {
 	/* Get the normal pci resources of this device */
 	pci_dev_read_resources(dev);
@@ -36,7 +36,8 @@ static void ide_init(struct device *dev)
 {
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void lpci_set_subsystem(struct device *dev, unsigned vendor,
+			       unsigned device)
 {
 	pci_write_config32(dev, 0x40,
 		((device & 0xffff) << 16) | (vendor & 0xffff));
diff --git a/src/southbridge/broadcom/bcm5785/lpc.c b/src/southbridge/broadcom/bcm5785/lpc.c
index 05dbbc336d..b10c23fcd1 100644
--- a/src/southbridge/broadcom/bcm5785/lpc.c
+++ b/src/southbridge/broadcom/bcm5785/lpc.c
@@ -26,7 +26,7 @@
 #include <arch/ioapic.h>
 #include "bcm5785.h"
 
-static void lpc_init(device_t dev)
+static void lpc_init(struct device *dev)
 {
 	/* Initialize the real time clock */
 	cmos_init(0);
@@ -35,7 +35,7 @@ static void lpc_init(device_t dev)
 	isa_dma_init();
 }
 
-static void bcm5785_lpc_read_resources(device_t dev)
+static void bcm5785_lpc_read_resources(struct device *dev)
 {
 	struct resource *res;
 
@@ -66,7 +66,7 @@ static void bcm5785_lpc_read_resources(device_t dev)
  *
  * @param dev The device whos children's resources are to be enabled.
  */
-static void bcm5785_lpc_enable_childrens_resources(device_t dev)
+static void bcm5785_lpc_enable_childrens_resources(struct device *dev)
 {
 	struct bus *link;
 	uint32_t reg;
@@ -74,7 +74,7 @@ static void bcm5785_lpc_enable_childrens_resources(device_t dev)
 	reg = pci_read_config8(dev, 0x44);
 
 	for (link = dev->link_list; link; link = link->next) {
-		device_t child;
+		struct device *child;
 		for (child = link->children; child; child = child->sibling) {
 			if (child->enabled && (child->path.type == DEVICE_PATH_PNP)) {
 				struct resource *res;
@@ -110,13 +110,14 @@ static void bcm5785_lpc_enable_childrens_resources(device_t dev)
 
 }
 
-static void bcm5785_lpc_enable_resources(device_t dev)
+static void bcm5785_lpc_enable_resources(struct device *dev)
 {
 	pci_dev_enable_resources(dev);
 	bcm5785_lpc_enable_childrens_resources(dev);
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void lpci_set_subsystem(struct device *dev, unsigned vendor,
+			       unsigned device)
 {
 	pci_write_config32(dev, 0x40,
 		((device & 0xffff) << 16) | (vendor & 0xffff));
diff --git a/src/southbridge/broadcom/bcm5785/sata.c b/src/southbridge/broadcom/bcm5785/sata.c
index 57df3d2e33..007a2fa38c 100644
--- a/src/southbridge/broadcom/bcm5785/sata.c
+++ b/src/southbridge/broadcom/bcm5785/sata.c
@@ -68,7 +68,8 @@ static void sata_init(struct device *dev)
 	}
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void lpci_set_subsystem(struct device *dev, unsigned vendor,
+			       unsigned device)
 {
 	pci_write_config32(dev, 0x40,
 		((device & 0xffff) << 16) | (vendor & 0xffff));
diff --git a/src/southbridge/broadcom/bcm5785/sb_pci_main.c b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
index c1294342dd..5d98e7b4ee 100644
--- a/src/southbridge/broadcom/bcm5785/sb_pci_main.c
+++ b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
@@ -29,7 +29,7 @@
 
 #define NMI_OFF 0
 
-static void sb_init(device_t dev)
+static void sb_init(struct device *dev)
 {
 	uint8_t byte;
 	uint8_t byte_old;
@@ -52,7 +52,7 @@ static void sb_init(device_t dev)
 
 }
 
-static void bcm5785_sb_read_resources(device_t dev)
+static void bcm5785_sb_read_resources(struct device *dev)
 {
 	struct resource *res;
 
@@ -72,7 +72,7 @@ static void bcm5785_sb_read_resources(device_t dev)
 
 }
 
-static int lsmbus_recv_byte(device_t dev)
+static int lsmbus_recv_byte(struct device *dev)
 {
 	unsigned device;
 	struct resource *res;
@@ -86,7 +86,7 @@ static int lsmbus_recv_byte(device_t dev)
 	return do_smbus_recv_byte(res->base, device);
 }
 
-static int lsmbus_send_byte(device_t dev, uint8_t val)
+static int lsmbus_send_byte(struct device *dev, uint8_t val)
 {
 	unsigned device;
 	struct resource *res;
@@ -100,7 +100,7 @@ static int lsmbus_send_byte(device_t dev, uint8_t val)
 	return do_smbus_send_byte(res->base, device, val);
 }
 
-static int lsmbus_read_byte(device_t dev, uint8_t address)
+static int lsmbus_read_byte(struct device *dev, uint8_t address)
 {
 	unsigned device;
 	struct resource *res;
@@ -114,7 +114,7 @@ static int lsmbus_read_byte(device_t dev, uint8_t address)
 	return do_smbus_read_byte(res->base, device, address);
 }
 
-static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
+static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val)
 {
 	unsigned device;
 	struct resource *res;
@@ -135,7 +135,8 @@ static struct smbus_bus_operations lops_smbus_bus = {
 	.write_byte = lsmbus_write_byte,
 };
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void lpci_set_subsystem(struct device *dev, unsigned vendor,
+			       unsigned device)
 {
 	pci_write_config32(dev, 0x2c,
 		((device & 0xffff) << 16) | (vendor & 0xffff));
diff --git a/src/southbridge/broadcom/bcm5785/usb.c b/src/southbridge/broadcom/bcm5785/usb.c
index 9aa64df842..ab8e588f84 100644
--- a/src/southbridge/broadcom/bcm5785/usb.c
+++ b/src/southbridge/broadcom/bcm5785/usb.c
@@ -33,7 +33,8 @@ static void usb_init(struct device *dev)
 
 }
 
-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void lpci_set_subsystem(struct device *dev, unsigned vendor,
+			       unsigned device)
 {
 	pci_write_config32(dev, 0x40,
 		((device & 0xffff) << 16) | (vendor & 0xffff));