summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2021-02-22 18:33:08 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-02-24 11:28:16 +0000
commitb238caaacad022a15bb3d9b46f582dc58aac786b (patch)
tree888d80911e6c0e357f126563ffadc2e10c26bbd9
parent318c3ad6745ade5caa3257df15052131c4a1235b (diff)
device/device.c: Rename .disable to .vga_disable
This makes it clear what this function pointer is used for. Change-Id: I2090e164edee513e05a9409d6c7d18c2cdeb8662 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51009 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/device/device.c4
-rw-r--r--src/include/device/device.h2
-rw-r--r--src/northbridge/intel/i945/gma.c2
-rw-r--r--src/northbridge/intel/sandybridge/gma.c2
-rw-r--r--src/northbridge/intel/x4x/gma.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/device/device.c b/src/device/device.c
index 18efd5dcd5..aa10d6f451 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -228,9 +228,9 @@ static void set_vga_bridge_bits(void)
/* If we prefer plugin VGA over chipset VGA, the chipset might
want to know. */
if (!CONFIG(ONBOARD_VGA_IS_PRIMARY) && (vga != vga_onboard) &&
- vga_onboard && vga_onboard->ops && vga_onboard->ops->disable) {
+ vga_onboard && vga_onboard->ops && vga_onboard->ops->vga_disable) {
printk(BIOS_DEBUG, "Use plugin graphics over integrated.\n");
- vga_onboard->ops->disable(vga_onboard);
+ vga_onboard->ops->vga_disable(vga_onboard);
}
if (vga) {
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 0e1ca12613..01e2c825a1 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -43,7 +43,7 @@ struct device_operations {
void (*final)(struct device *dev);
void (*scan_bus)(struct device *bus);
void (*enable)(struct device *dev);
- void (*disable)(struct device *dev);
+ void (*vga_disable)(struct device *dev);
void (*reset_bus)(struct bus *bus);
#if CONFIG(GENERATE_SMBIOS_TABLES)
int (*get_smbios_data)(struct device *dev, int *handle,
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index b396effd1c..e00026a131 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -744,7 +744,7 @@ static struct device_operations gma_func0_ops = {
.enable_resources = pci_dev_enable_resources,
.init = gma_func0_init,
.acpi_fill_ssdt = gma_generate_ssdt,
- .disable = gma_func0_disable,
+ .vga_disable = gma_func0_disable,
.ops_pci = &pci_dev_ops_pci,
.acpi_name = gma_acpi_name,
};
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 86e12b0c64..1e5458d4ab 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -646,7 +646,7 @@ static struct device_operations gma_func0_ops = {
.enable_resources = pci_dev_enable_resources,
.acpi_fill_ssdt = gma_generate_ssdt,
.init = gma_func0_init,
- .disable = gma_func0_disable,
+ .vga_disable = gma_func0_disable,
.ops_pci = &pci_dev_ops_pci,
.acpi_name = gma_acpi_name,
};
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 03e738d8a1..096ceb76e9 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -71,7 +71,7 @@ static struct device_operations gma_func0_ops = {
.acpi_fill_ssdt = gma_generate_ssdt,
.init = gma_func0_init,
.ops_pci = &pci_dev_ops_pci,
- .disable = gma_func0_disable,
+ .vga_disable = gma_func0_disable,
.acpi_name = gma_acpi_name,
};