[coreboot-gerrit] Change in coreboot[master]: nb/intel/i945/rcven.c: Use enum cb_err for static functions

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61802 )

Change subject: nb/intel/i945/rcven.c: Use enum cb_err for static functions
......................................................................

nb/intel/i945/rcven.c: Use enum cb_err for static functions

Use enum cb_err as return type instead of int.

Change-Id: Ia8f5e92fec20fe9a9c9b8615c40fc3e7378d3513
Signed-off-by: Elyes Haouas 
---
M src/northbridge/intel/i945/rcven.c
1 file changed, 29 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/61802/1

diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c
index ca54bad..0196c81 100644
--- a/src/northbridge/intel/i945/rcven.c
+++ b/src/northbridge/intel/i945/rcven.c
@@ -2,6 +2,8 @@

#include <console/console.h>
 #include <device/mmio.h>
+#include <types.h>
+
 #include "raminit.h"
 #include "i945.h"

@@ -84,30 +86,29 @@

}

-static int normalize(int channel_offset, u8 *mediumcoarse, u8 *fine)
+static enum cb_err normalize(int channel_offset, u8 *mediumcoarse, u8 *fine)
 {
    printk(BIOS_SPEW, "  %s()\n", __func__);

if (*fine < 0x80)
-		return 0;
+		return CB_SUCCESS;

*fine -= 0x80;
    *mediumcoarse += 1;

if (*mediumcoarse >= 0x40) {
    	printk(BIOS_DEBUG, "Normalize Error\n");
-		return -1;
+		return CB_ERR;
    }

set_receive_enable(channel_offset, *mediumcoarse & 3, *mediumcoarse >> 2);

mchbar_write8(C0WL0REOST + channel_offset, *fine);

-	return 0;
+	return CB_SUCCESS;
 }

-static int find_preamble(int channel_offset, u8 *mediumcoarse,
-			 struct sys_info *sysinfo)
+static enum cb_err find_preamble(int channel_offset, u8 *mediumcoarse, struct sys_info *sysinfo)
 {
    /* find start of the data phase */
    u32 reg32;
@@ -117,7 +118,7 @@
    do {
    	if (*mediumcoarse < 4) {
    		printk(BIOS_DEBUG, "No Preamble found.\n");
-			return -1;
+			return CB_ERR;
    	}
    	*mediumcoarse -= 4;

@@ -129,17 +130,17 @@

if (!(reg32 & (1 << 18))) {
    	printk(BIOS_DEBUG, "No Preamble found (neither high nor low).\n");
-		return -1;
+		return CB_ERR;
    }

-	return 0;
+	return CB_SUCCESS;
 }

/**
  * add a quarter clock to the current receive enable settings
  */

-static int add_quarter_clock(int channel_offset, u8 *mediumcoarse, u8 *fine)
+static enum cb_err add_quarter_clock(int channel_offset, u8 *mediumcoarse, u8 *fine)
 {
    printk(BIOS_SPEW, "  %s() mediumcoarse=%02x fine=%02x\n", __func__,
    		*mediumcoarse, *fine);
@@ -149,7 +150,7 @@
    	*mediumcoarse += 2;
    	if (*mediumcoarse >= 0x40) {
    		printk(BIOS_DEBUG, "clocks at max.\n");
-			return -1;
+			return CB_ERR;
    	}

set_receive_enable(channel_offset, *mediumcoarse & 3, *mediumcoarse >> 2);
@@ -159,11 +160,11 @@

mchbar_write8(C0WL0REOST + channel_offset, *fine);

-	return 0;
+	return CB_SUCCESS;
 }

-static int find_strobes_low(int channel_offset, u8 *mediumcoarse, u8 *fine,
-			    struct sys_info *sysinfo)
+static enum cb_err find_strobes_low(int channel_offset, u8 *mediumcoarse, u8 *fine,
+				    struct sys_info *sysinfo)
 {
    u32 rcvenmt;

@@ -177,7 +178,7 @@
    	rcvenmt = sample_strobes(channel_offset, sysinfo);

if (((rcvenmt & (1 << 18)) != 0))
-			return 0;
+			return CB_SUCCESS;

*fine -= 0x80;
    	if (*fine == 0)
@@ -192,11 +193,11 @@
    }

printk(BIOS_DEBUG, "Could not find low strobe\n");
-	return 0;
+	return CB_SUCCESS;
 }

-static int find_strobes_edge(int channel_offset, u8 *mediumcoarse, u8 *fine,
-			     struct sys_info *sysinfo)
+static enum cb_err find_strobes_edge(int channel_offset, u8 *mediumcoarse, u8 *fine,
+				     struct sys_info *sysinfo)
 {

int counter;
@@ -237,7 +238,7 @@
    	}

printk(BIOS_DEBUG, "Could not find rising edge.\n");
-		return -1;
+		return CB_ERR;
    }

*fine -= 7;
@@ -249,7 +250,7 @@
    *fine &= ~(1 << 3);
    mchbar_write8(C0WL0REOST + channel_offset, *fine);

-	return 0;
+	return CB_SUCCESS;
 }

/**
@@ -258,7 +259,7 @@
  * a lot of if ()s so let's just pass 0 or 0x80 for the channel offset.
  */

-static int receive_enable_autoconfig(int channel_offset, struct sys_info *sysinfo)
+static enum cb_err receive_enable_autoconfig(int channel_offset, struct sys_info *sysinfo)
 {
    u8 mediumcoarse;
    u8 fine;
@@ -270,22 +271,22 @@
    fine = 0;

if (find_strobes_low(channel_offset, &mediumcoarse, &fine, sysinfo))
-		return -1;
+		return CB_ERR;

if (find_strobes_edge(channel_offset, &mediumcoarse, &fine, sysinfo))
-		return -1;
+		return CB_ERR;

if (add_quarter_clock(channel_offset, &mediumcoarse, &fine))
-		return -1;
+		return CB_ERR;

if (find_preamble(channel_offset, &mediumcoarse, sysinfo))
-		return -1;
+		return CB_ERR;

if (add_quarter_clock(channel_offset, &mediumcoarse, &fine))
-		return -1;
+		return CB_ERR;

if (normalize(channel_offset, &mediumcoarse, &fine))
-		return -1;
+		return CB_ERR;

/* This is a debug check to see if the rcven code is fully working.
     * It can be removed when the output message is not printed anymore
@@ -293,7 +294,7 @@
    if (mchbar_read8(C0WL0REOST + channel_offset) == 0)
    	printk(BIOS_DEBUG, "Weird. No C%sWL0REOST\n", channel_offset ? "1" : "0");

-	return 0;
+	return CB_SUCCESS;
 }

void receive_enable_adjust(struct sys_info *sysinfo)