diff mbox

[U-Boot,18/23] x86: tnc: Change disable_igd() to have a return value

Message ID 1454319658-17431-19-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit 9e36c53dd0b86d8e19c764945401440dee65d016
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng Feb. 1, 2016, 9:40 a.m. UTC
So far disable_igd() does not have any return value, but we may need
that in the future.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/queensbay/tnc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Simon Glass Feb. 1, 2016, 4:20 p.m. UTC | #1
On 1 February 2016 at 02:40, Bin Meng <bmeng.cn@gmail.com> wrote:
> So far disable_igd() does not have any return value, but we may need
> that in the future.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/queensbay/tnc.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Tested on Minnowmax:
Tested-by: Simon Glass <sjg@chromium.org>
Bin Meng Feb. 3, 2016, 4:33 a.m. UTC | #2
On Tue, Feb 2, 2016 at 12:20 AM, Simon Glass <sjg@chromium.org> wrote:
> On 1 February 2016 at 02:40, Bin Meng <bmeng.cn@gmail.com> wrote:
>> So far disable_igd() does not have any return value, but we may need
>> that in the future.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/cpu/queensbay/tnc.c | 10 +++++++---
>>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Tested on Minnowmax:
> Tested-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86/master, thanks!
diff mbox

Patch

diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index f9fddc1..8b79505 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -14,7 +14,7 @@ 
 #include <asm/fsp/fsp_support.h>
 #include <asm/processor.h>
 
-static void __maybe_unused disable_igd(void)
+static int __maybe_unused disable_igd(void)
 {
 	/*
 	 * According to Atom E6xx datasheet, setting VGA Disable (bit17)
@@ -36,6 +36,8 @@  static void __maybe_unused disable_igd(void)
 	 */
 	x86_pci_write_config32(TNC_IGD, IGD_FD, FUNC_DISABLE);
 	x86_pci_write_config32(TNC_SDVO, IGD_FD, FUNC_DISABLE);
+
+	return 0;
 }
 
 int arch_cpu_init(void)
@@ -53,9 +55,11 @@  int arch_cpu_init(void)
 
 int arch_early_init_r(void)
 {
+	int ret = 0;
+
 #ifdef CONFIG_DISABLE_IGD
-	disable_igd();
+	ret = disable_igd();
 #endif
 
-	return 0;
+	return ret;
 }