[coreboot-gerrit] Change in coreboot[master]: sb/sis/sis966: Get rid of device_t
Elyes HAOUAS (Code Review)
gerrit at coreboot.org
Sat May 19 10:50:47 CEST 2018
Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26398
Change subject: sb/sis/sis966: Get rid of device_t
......................................................................
sb/sis/sis966: Get rid of device_t
Use of device_t has been abandoned in ramstage.
Change-Id: I6002949fa90a46a2dd0e3519acbf2606bb679322
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/southbridge/sis/sis966/aza.c
M src/southbridge/sis/sis966/early_setup_car.c
M src/southbridge/sis/sis966/ide.c
M src/southbridge/sis/sis966/lpc.c
M src/southbridge/sis/sis966/nic.c
M src/southbridge/sis/sis966/sata.c
M src/southbridge/sis/sis966/sis761.c
M src/southbridge/sis/sis966/sis966.c
M src/southbridge/sis/sis966/sis966.h
M src/southbridge/sis/sis966/usb.c
M src/southbridge/sis/sis966/usb2.c
11 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/26398/1
diff --git a/src/southbridge/sis/sis966/aza.c b/src/southbridge/sis/sis966/aza.c
index f1a46b5..bbde00a 100644
--- a/src/southbridge/sis/sis966/aza.c
+++ b/src/southbridge/sis/sis966/aza.c
@@ -295,7 +295,7 @@
printk(BIOS_DEBUG, "AZALIA_INIT:<----------\n");
}
-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/sis/sis966/early_setup_car.c b/src/southbridge/sis/sis966/early_setup_car.c
index ba6d8a3..e79d40c 100644
--- a/src/southbridge/sis/sis966/early_setup_car.c
+++ b/src/southbridge/sis/sis966/early_setup_car.c
@@ -23,7 +23,7 @@
uint32_t pll_ctrl;
uint32_t dword;
int i;
- device_t dev;
+ struct device *dev;
dev = PCI_DEV(busnx, devnx+1, 1);
dword = pci_read_config32(dev, 0xe4);
dword |= 0x3f0; // disable it at first
diff --git a/src/southbridge/sis/sis966/ide.c b/src/southbridge/sis/sis966/ide.c
index 6c7c7fe..13bf1d1 100644
--- a/src/southbridge/sis/sis966/ide.c
+++ b/src/southbridge/sis/sis966/ide.c
@@ -158,7 +158,7 @@
printk(BIOS_DEBUG, "IDE_INIT:<----------\n");
}
-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/sis/sis966/lpc.c b/src/southbridge/sis/sis966/lpc.c
index 82b850b..2140d01 100644
--- a/src/southbridge/sis/sis966/lpc.c
+++ b/src/southbridge/sis/sis966/lpc.c
@@ -52,7 +52,7 @@
#undef SLAVE_INIT
-static void lpc_common_init(device_t dev)
+static void lpc_common_init(struct device *dev)
{
uint8_t byte;
void *ioapic_base;
@@ -67,13 +67,13 @@
}
#ifdef SLAVE_INIT
-static void lpc_slave_init(device_t dev)
+static void lpc_slave_init(struct device *dev)
{
lpc_common_init(dev);
}
#endif
-static void lpc_usb_legacy_init(device_t dev)
+static void lpc_usb_legacy_init(struct device *dev)
{
uint16_t acpi_base;
@@ -83,7 +83,7 @@
outb(inb(acpi_base + 0xba) |0x80, acpi_base + 0xba);
}
-static void lpc_init(device_t dev)
+static void lpc_init(struct device *dev)
{
uint8_t byte;
uint8_t byte_old;
@@ -152,7 +152,7 @@
printk(BIOS_DEBUG, "LPC_INIT <--------\n");
}
-static void sis966_lpc_read_resources(device_t dev)
+static void sis966_lpc_read_resources(struct device *dev)
{
struct resource *res;
@@ -183,7 +183,7 @@
*
* @param dev The device whose children's resources are to be enabled.
*/
-static void sis966_lpc_enable_childrens_resources(device_t dev)
+static void sis966_lpc_enable_childrens_resources(struct device *dev)
{
struct bus *link;
uint32_t reg, reg_var[4];
@@ -193,7 +193,7 @@
reg = pci_read_config32(dev, 0xa0);
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;
@@ -234,13 +234,13 @@
}
-static void sis966_lpc_enable_resources(device_t dev)
+static void sis966_lpc_enable_resources(struct device *dev)
{
pci_dev_enable_resources(dev);
sis966_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/sis/sis966/nic.c b/src/southbridge/sis/sis966/nic.c
index fee2988..4e835dd 100644
--- a/src/southbridge/sis/sis966/nic.c
+++ b/src/southbridge/sis/sis966/nic.c
@@ -311,7 +311,7 @@
}
-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/sis/sis966/sata.c b/src/southbridge/sis/sis966/sata.c
index b9e8432..7dc7afb 100644
--- a/src/southbridge/sis/sis966/sata.c
+++ b/src/southbridge/sis/sis966/sata.c
@@ -145,7 +145,7 @@
printk(BIOS_DEBUG, "SATA_INIT:<----------\n");
}
-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/sis/sis966/sis761.c b/src/southbridge/sis/sis966/sis761.c
index 174cda3..93f8142 100644
--- a/src/southbridge/sis/sis966/sis761.c
+++ b/src/southbridge/sis/sis966/sis761.c
@@ -64,7 +64,7 @@
*
* @param dev TODO
*/
-static void sis761_read_resources(device_t dev)
+static void sis761_read_resources(struct device *dev)
{
/* Read the generic PCI resources */
printk(BIOS_DEBUG, "sis761_read_resources ------->\n");
@@ -81,7 +81,7 @@
}
-static void sis761_set_resources(device_t dev)
+static void sis761_set_resources(struct device *dev)
{
printk(BIOS_DEBUG, "sis761_set_resources ------->\n");
diff --git a/src/southbridge/sis/sis966/sis966.c b/src/southbridge/sis/sis966/sis966.c
index cba4898..d1cb4da 100644
--- a/src/southbridge/sis/sis966/sis966.c
+++ b/src/southbridge/sis/sis966/sis966.c
@@ -31,10 +31,10 @@
static uint32_t final_reg;
-static device_t find_lpc_dev( device_t dev, unsigned devfn)
+static struct device *find_lpc_dev( struct device *dev, unsigned devfn)
{
- device_t lpc_dev;
+ struct device *lpc_dev;
lpc_dev = dev_find_slot(dev->bus->secondary, devfn);
@@ -54,10 +54,10 @@
return lpc_dev;
}
-void sis966_enable(device_t dev)
+void sis966_enable(struct device *dev)
{
- device_t lpc_dev = 0;
- device_t sm_dev = 0;
+ struct device *lpc_dev = 0;
+ struct device *sm_dev = 0;
uint16_t index = 0;
uint16_t index2 = 0;
uint32_t reg_old, reg;
diff --git a/src/southbridge/sis/sis966/sis966.h b/src/southbridge/sis/sis966/sis966.h
index 61bf0ee..bc59546 100644
--- a/src/southbridge/sis/sis966/sis966.h
+++ b/src/southbridge/sis/sis966/sis966.h
@@ -32,7 +32,7 @@
#define DEBUG_USB2 0
#ifndef __SIMPLE_DEVICE__
-void sis966_enable(device_t dev);
+void sis966_enable(struct device *dev);
#endif
#endif /* SIS966_H */
diff --git a/src/southbridge/sis/sis966/usb.c b/src/southbridge/sis/sis966/usb.c
index 3f4f98d..de8076d 100644
--- a/src/southbridge/sis/sis966/usb.c
+++ b/src/southbridge/sis/sis966/usb.c
@@ -86,7 +86,7 @@
printk(BIOS_DEBUG, "USB 1.1 INIT:<----------\n");
}
-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/sis/sis966/usb2.c b/src/southbridge/sis/sis966/usb2.c
index 79e7d09..095a955 100644
--- a/src/southbridge/sis/sis966/usb2.c
+++ b/src/southbridge/sis/sis966/usb2.c
@@ -103,7 +103,7 @@
printk(BIOS_DEBUG, "USB 2.0 INIT:<----------\n");
}
-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));
--
To view, visit https://review.coreboot.org/26398
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6002949fa90a46a2dd0e3519acbf2606bb679322
Gerrit-Change-Number: 26398
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180519/f6f0fc05/attachment-0001.html>
More information about the coreboot-gerrit
mailing list