From bd65985a637ef75cf68c53b6c32e676b43b2aa2c Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 5 Jan 2020 20:00:18 +0200 Subject: nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic9554ad2813ee70d0da16857d534aab5e17d808f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/38213 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/northbridge/intel/i945/raminit.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/northbridge/intel/i945/raminit.c') diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index 709677469f..f0ea142c5d 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -62,11 +62,6 @@ static int get_dimm_spd_address(struct sys_info *sysinfo, int device) } -static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static __attribute__((noinline)) void do_ram_command(u32 command) { u32 reg32; @@ -365,7 +360,7 @@ static void gather_common_timing(struct sys_info *sysinfo, if (!sdram_capabilities_dual_channel() && (i >> 1)) continue; - if (spd_read_byte(device, SPD_MEMORY_TYPE) != + if (smbus_read_byte(device, SPD_MEMORY_TYPE) != SPD_MEMORY_TYPE_SDRAM_DDR2) { printk(BIOS_DEBUG, "DDR II Channel %d Socket %d: N/A\n", (i >> 1), (i & 1)); @@ -386,7 +381,7 @@ static void gather_common_timing(struct sys_info *sysinfo, printk(BIOS_DEBUG, "i2c block operation failed," " trying smbus byte operation.\n"); for (j = 0; j < 64; j++) - raw_spd[j] = spd_read_byte(device, j); + raw_spd[j] = smbus_read_byte(device, j); if (CONFIG(DEBUG_RAM_SETUP)) hexdump(raw_spd, 64); } -- cgit v1.2.3