[coreboot] r3101 - trunk/util/flashrom

Author: uwe
Date: 2008-02-11 15:32:45 +0100 (Mon, 11 Feb 2008)
New Revision: 3101

Modified:
   trunk/util/flashrom/chipset_enable.c
Log:
flashrom: further cleanups to enable_flash_cs5536

- Remove the "enable write to flash" message, as the caller appears to
   already report that.

- Move the 'modprobe msr' suggestions to the first lseek64 error handling, as
   we get an error there already.

- Rename a perror string from "read" to "read msr", as we use the latter
   already in this function for another read.

Signed-off-by: Mart Raudsepp 
Acked-by: Uwe Hermann

Modified: trunk/util/flashrom/chipset_enable.c
===================================================================
--- trunk/util/flashrom/chipset_enable.c	2008-02-09 13:06:45 UTC (rev 3100)
+++ trunk/util/flashrom/chipset_enable.c	2008-02-11 14:32:45 UTC (rev 3101)
@@ -259,18 +259,17 @@

if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) {
    	perror("lseek64");
+		printf("Cannot operate on MSR. Did you run 'modprobe msr'?\n");
    	close(fd_msr);
    	return -1;
    }

if (read(fd_msr, buf, 8) != 8) {
-		perror("read");
+		perror("read msr");
    	close(fd_msr);
    	return -1;
    }

-	printf("Enabling Geode MSR to write to flash.\n");
-
    if (buf[7] != 0x22) {
    	buf[7] &= 0xfb;
    	if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) {
@@ -281,7 +280,6 @@

if (write(fd_msr, buf, 8) < 0) {
    		perror("msr write");
-			printf("Cannot write to MSR. Did you run 'modprobe msr'?\n");
    		close(fd_msr);
    		return -1;
    	}
@@ -309,7 +307,6 @@
    }
    if (write(fd_msr, buf, 8) < 0) {
    	perror("msr write");
-		printf("Cannot write to MSR. Did you run 'modprobe msr'?\n");
    	close(fd_msr);
    	return -1;
    }