[coreboot-gerrit] Change in coreboot[master]: soc/intel/*/opregion.h: Rename init_igd_opregion

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded a new change for review. ( https://review.coreboot.org/19738 )

Change subject: soc/intel/*/opregion.h: Rename init_igd_opregion
......................................................................

soc/intel/*/opregion.h: Rename init_igd_opregion

Rename init_igd_opregion to init_igd_opregion_ext.
Prevents conflicts with existing implementations in nb folder.

Change-Id: Ia18c9e6cc32b2cf1e63682d74d1fcb1b818197fe
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/soc/intel/apollolake/graphics.c
M src/soc/intel/common/opregion.c
M src/soc/intel/common/opregion.h
M src/soc/intel/skylake/igd.c
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/19738/1

diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c
index 9963d2c..cee3f09 100644
--- a/src/soc/intel/apollolake/graphics.c
+++ b/src/soc/intel/apollolake/graphics.c
@@ -45,7 +45,7 @@
 	printk(BIOS_DEBUG, "ACPI:    * IGD OpRegion\n");
 	opregion = (igd_opregion_t *)current;
 
-	if (!init_igd_opregion(opregion))
+	if (!init_igd_opregion_ext(opregion))
 		return current;
 
 	current += sizeof(igd_opregion_t);
diff --git a/src/soc/intel/common/opregion.c b/src/soc/intel/common/opregion.c
index ae52b55..4084b26 100644
--- a/src/soc/intel/common/opregion.c
+++ b/src/soc/intel/common/opregion.c
@@ -21,7 +21,7 @@
 #include <drivers/intel/gma/i915.h>
 #include "opregion.h"
 
-int init_igd_opregion(igd_opregion_t *opregion)
+int init_igd_opregion_ext(igd_opregion_t *opregion)
 {
 	struct region_device vbt_rdev;
 	optionrom_vbt_t *vbt;
diff --git a/src/soc/intel/common/opregion.h b/src/soc/intel/common/opregion.h
index bcffe6e..f097003 100644
--- a/src/soc/intel/common/opregion.h
+++ b/src/soc/intel/common/opregion.h
@@ -19,6 +19,6 @@
 #include <drivers/intel/gma/opregion.h>
 
 /* Loads vbt and initializes opregion. Returns non-zero on success */
-int init_igd_opregion(igd_opregion_t *opregion);
+int init_igd_opregion_ext(igd_opregion_t *opregion);
 
 #endif /* _COMMON_OPREGION_H_ */
diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c
index 2d0187f..a7c997b 100644
--- a/src/soc/intel/skylake/igd.c
+++ b/src/soc/intel/skylake/igd.c
@@ -168,7 +168,7 @@
 
 	printk(BIOS_DEBUG, "ACPI: * IGD OpRegion\n");
 	opregion = (igd_opregion_t *)current;
-	init_igd_opregion(opregion);
+	init_igd_opregion_ext(opregion);
 	update_igd_opregion(opregion);
 	current += sizeof(igd_opregion_t);
 	current = acpi_align_current(current);

-- 
To view, visit https://review.coreboot.org/19738
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18c9e6cc32b2cf1e63682d74d1fcb1b818197fe
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>