From 152f1c918fdeb638d434b224ad1ca3e65aeeba78 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Tue, 15 May 2018 16:54:19 +0200 Subject: sb/intel/i82801ax: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: I5c18fdc24bd0432f6b7a1131af68c792d377c3ac Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26252 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/southbridge/intel/i82801ax/i82801ax.c | 4 ++-- src/southbridge/intel/i82801ax/i82801ax.h | 2 +- src/southbridge/intel/i82801ax/lpc.c | 10 +++++----- src/southbridge/intel/i82801ax/smbus.c | 2 +- src/southbridge/intel/i82801ax/watchdog.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/southbridge/intel/i82801ax/i82801ax.c b/src/southbridge/intel/i82801ax/i82801ax.c index 7ef22e25d8..37c264ecd6 100644 --- a/src/southbridge/intel/i82801ax/i82801ax.c +++ b/src/southbridge/intel/i82801ax/i82801ax.c @@ -21,10 +21,10 @@ #include #include "i82801ax.h" -void i82801ax_enable(device_t dev) +void i82801ax_enable(struct device *dev) { u16 reg16, index; - device_t lpc_dev; + struct device *lpc_dev; /* Search for the 82801AA/AB LPC device (D31:F0) on PCI bus 0. */ lpc_dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0)); diff --git a/src/southbridge/intel/i82801ax/i82801ax.h b/src/southbridge/intel/i82801ax/i82801ax.h index 879c25a835..a23da35bac 100644 --- a/src/southbridge/intel/i82801ax/i82801ax.h +++ b/src/southbridge/intel/i82801ax/i82801ax.h @@ -19,7 +19,7 @@ #if !defined(__PRE_RAM__) #include "chip.h" -void i82801ax_enable(device_t dev); +void i82801ax_enable(struct device *dev); #else void enable_smbus(void); int smbus_read_byte(u8 device, u8 address); diff --git a/src/southbridge/intel/i82801ax/lpc.c b/src/southbridge/intel/i82801ax/lpc.c index 29ed036abf..44ea03b1c8 100644 --- a/src/southbridge/intel/i82801ax/lpc.c +++ b/src/southbridge/intel/i82801ax/lpc.c @@ -118,7 +118,7 @@ static void i82801ax_enable_serial_irqs(struct device *dev) /* TODO: Explain/#define the real meaning of these magic numbers. */ } -static void i82801ax_pirq_init(device_t dev) +static void i82801ax_pirq_init(struct device *dev) { u8 reg8; config_t *config = dev->chip_info; @@ -136,7 +136,7 @@ static void i82801ax_pirq_init(device_t dev) pci_write_config8(dev, PIRQD_ROUT, reg8); } -static void i82801ax_power_options(device_t dev) +static void i82801ax_power_options(struct device *dev) { uint8_t byte; int pwr_on = -1; @@ -166,7 +166,7 @@ static void i82801ax_power_options(device_t dev) } } -static void gpio_init(device_t dev) +static void gpio_init(struct device *dev) { pci_write_config32(dev, GPIO_BASE, (GPIO_BASE_ADDR | 1)); pci_write_config8(dev, GPIO_CNTL, GPIO_EN); @@ -207,7 +207,7 @@ static void i82801ax_lpc_route_dma(struct device *dev, uint8_t mask) pci_write_config16(dev, PCI_DMA_CFG, reg16); } -static void i82801ax_lpc_decode_en(device_t dev) +static void i82801ax_lpc_decode_en(struct device *dev) { /* Decode 0x3F8-0x3FF (COM1) for COMA port, 0x2F8-0x2FF (COM2) for COMB. * LPT decode defaults to 0x378-0x37F and 0x778-0x77F. @@ -251,7 +251,7 @@ static void lpc_init(struct device *dev) i82801ax_lpc_decode_en(dev); } -static void i82801ax_lpc_read_resources(device_t dev) +static void i82801ax_lpc_read_resources(struct device *dev) { struct resource *res; diff --git a/src/southbridge/intel/i82801ax/smbus.c b/src/southbridge/intel/i82801ax/smbus.c index 1e71a984a8..d76ab923e2 100644 --- a/src/southbridge/intel/i82801ax/smbus.c +++ b/src/southbridge/intel/i82801ax/smbus.c @@ -22,7 +22,7 @@ #include #include "i82801ax.h" -static int lsmbus_read_byte(device_t dev, u8 address) +static int lsmbus_read_byte(struct device *dev, u8 address) { u16 device; struct resource *res; diff --git a/src/southbridge/intel/i82801ax/watchdog.c b/src/southbridge/intel/i82801ax/watchdog.c index 60a7b57b6c..d0af76c030 100644 --- a/src/southbridge/intel/i82801ax/watchdog.c +++ b/src/southbridge/intel/i82801ax/watchdog.c @@ -24,7 +24,7 @@ void watchdog_off(void) { - device_t dev; + struct device *dev; unsigned long value, base; /* Turn off the ICH5 watchdog. */ -- cgit v1.2.3