From a397089259b49464ec966deb22fe87fc17e48cf7 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sat, 19 May 2018 10:39:20 +0200 Subject: [PATCH] sb/ti/pci{1x2x,i7420,xx12}: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: I37c6db65be4477dabb6064c3cc7ea1c63e467d19 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26397 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/southbridge/ti/pci1x2x/pci1x2x.c | 3 ++- src/southbridge/ti/pci7420/cardbus.c | 8 ++++---- src/southbridge/ti/pci7420/firewire.c | 4 ++-- src/southbridge/ti/pcixx12/pcixx12.c | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c index 883f00fd41..e670a43b06 100644 --- a/src/southbridge/ti/pci1x2x/pci1x2x.c +++ b/src/southbridge/ti/pci1x2x/pci1x2x.c @@ -39,7 +39,8 @@ static void ti_pci1x2y_init(struct device *dev) pci_write_config8(dev, 0x92, pci_read_config8(dev, 0x92) | 0x02); } -static void ti_pci1x2y_set_subsystem(device_t dev, unsigned vendor, unsigned device) +static void ti_pci1x2y_set_subsystem(struct device *dev, unsigned vendor, + unsigned device) { /* * Enable change sub-vendor ID. Clear the bit 5 to enable to write diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c index ce807dd718..910b0c88ed 100644 --- a/src/southbridge/ti/pci7420/cardbus.c +++ b/src/southbridge/ti/pci7420/cardbus.c @@ -28,7 +28,7 @@ static int cardbus_count = 0; #endif -static void pci7420_cardbus_init(device_t dev) +static void pci7420_cardbus_init(struct device *dev) { u8 reg8; u16 reg16; @@ -79,12 +79,12 @@ static void pci7420_cardbus_init(device_t dev) #endif } -static void pci7420_cardbus_read_resources(device_t dev) +static void pci7420_cardbus_read_resources(struct device *dev) { cardbus_read_resources(dev); } -static void pci7420_cardbus_set_resources(device_t dev) +static void pci7420_cardbus_set_resources(struct device *dev) { printk(BIOS_DEBUG, "%s In set resources\n",dev_path(dev)); @@ -113,7 +113,7 @@ static const struct pci_driver ti_pci7620_driver __pci_driver = { .device = 0xac8d, }; -static void ti_pci7420_enable_dev(device_t dev) +static void ti_pci7420_enable_dev(struct device *dev) { /* Nothing here yet */ } diff --git a/src/southbridge/ti/pci7420/firewire.c b/src/southbridge/ti/pci7420/firewire.c index 2f67141cd3..e42b6a65f8 100644 --- a/src/southbridge/ti/pci7420/firewire.c +++ b/src/southbridge/ti/pci7420/firewire.c @@ -24,7 +24,7 @@ #include "pci7420.h" #include "chip.h" -static void pci7420_firewire_init(device_t dev) +static void pci7420_firewire_init(struct device *dev) { printk(BIOS_DEBUG, "TI PCI7420/7620 FireWire init\n"); @@ -51,7 +51,7 @@ static const struct pci_driver ti_pci7420_driver __pci_driver = { .device = 0x802e, }; -static void ti_pci7420_firewire_enable_dev(device_t dev) +static void ti_pci7420_firewire_enable_dev(struct device *dev) { /* Nothing here yet */ } diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c index 91d4885e02..ab7231e640 100644 --- a/src/southbridge/ti/pcixx12/pcixx12.c +++ b/src/southbridge/ti/pcixx12/pcixx12.c @@ -21,18 +21,18 @@ #include #include -static void pcixx12_init(device_t dev) +static void pcixx12_init(struct device *dev) { /* cardbus controller function 1 for CF Socket */ printk(BIOS_DEBUG, "TI PCIxx12 init\n"); } -static void pcixx12_read_resources(device_t dev) +static void pcixx12_read_resources(struct device *dev) { cardbus_read_resources(dev); } -static void pcixx12_set_resources(device_t dev) +static void pcixx12_set_resources(struct device *dev) { printk(BIOS_DEBUG, "%s In set resources\n",dev_path(dev)); @@ -55,7 +55,7 @@ static const struct pci_driver ti_pcixx12_driver __pci_driver = { .device = 0x8039, }; -static void southbridge_init(device_t dev) +static void southbridge_init(struct device *dev) { }