[coreboot-gerrit] Change in coreboot[master]: soc/intel/common: Remove extra call layer

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38122 )

Change subject: soc/intel/common: Remove extra call layer
......................................................................

soc/intel/common: Remove extra call layer

Change-Id: I6987eb58b593e1f2bc6adf91be61bf7b5382440d
Signed-off-by: Kyösti Mälkki 
---
M src/soc/intel/common/block/smbus/smbuslib.c
1 file changed, 4 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/38122/1

diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c
index 0680ce2..6ea77ba 100644
--- a/src/soc/intel/common/block/smbus/smbuslib.c
+++ b/src/soc/intel/common/block/smbus/smbuslib.c
@@ -178,21 +178,6 @@
    return data;
 }

-static u16 smbus_read_word(u8 addr, u8 offset)
-{
-	return do_smbus_read_word(SMBUS_IO_BASE, addr, offset);
-}
-
-static u8 smbus_read_byte(u8 addr, u8 offset)
-{
-	return do_smbus_read_byte(SMBUS_IO_BASE, addr, offset);
-}
-
-static u8 smbus_write_byte(u8 addr, u8 offset, u8 value)
-{
-	return do_smbus_write_byte(SMBUS_IO_BASE, addr, offset, value);
-}
-
 static void update_spd_len(struct spd_block *blk)
 {
    u8 i, j = 0;
@@ -218,9 +203,9 @@
    for (i = 0; i < SPD_PAGE_LEN; i += step) {
    	if (CONFIG(SPD_READ_BY_WORD))
    		((u16*)spd)[i / sizeof(uint16_t)] =
-				 smbus_read_word(addr, i);
+				 do_smbus_read_word(SMBUS_IO_BASE, addr, i);
    	else
-			spd[i] = smbus_read_byte(addr, i);
+			spd[i] = do_smbus_read_byte(SMBUS_IO_BASE, addr, i);
    }
 }

@@ -239,10 +224,10 @@
    if (spd[SPD_DRAM_TYPE] == SPD_DRAM_DDR4 &&
    	CONFIG_DIMM_SPD_SIZE > SPD_PAGE_LEN) {
    	/* Switch to page 1 */
-		smbus_write_byte(SPD_PAGE_1, 0, 0);
+		do_smbus_write_byte(SMBUS_IO_BASE, SPD_PAGE_1, 0, 0);
    	smbus_read_spd(spd + SPD_PAGE_LEN, addr);
    	/* Restore to page 0 */
-		smbus_write_byte(SPD_PAGE_0, 0, 0);
+		do_smbus_write_byte(SMBUS_IO_BASE, SPD_PAGE_0, 0, 0);
    }
 }