[coreboot-gerrit] Change in coreboot[master]: device/device.c: Rename .disable to .vga_disable

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51009 )

Change subject: device/device.c: Rename .disable to .vga_disable
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51009
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/device/device.c
M src/include/device/device.h
M src/northbridge/intel/i945/gma.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/x4x/gma.c
5 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/device/device.c b/src/device/device.c
index 18efd5d..aa10d6f 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -228,9 +228,9 @@
    /* 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 0e1ca12..01e2c82 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -43,7 +43,7 @@
    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 b396eff..e00026a 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -744,7 +744,7 @@
    .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 86e12b0..1e5458d 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -646,7 +646,7 @@
    .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 03e738d..096ceb7 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -71,7 +71,7 @@
    .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,
 };