Fixup of r1397
- Mixing uninitialized and initialized local variables leads to
confusion.
- ft2232_spi error cases should have gotten some error handling, and
that's the reason the curly braces were there.
- Fixing typos/wording in some places would have been nice given that
those places were touched anyway.
Corresponding to flashrom svn r1413.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
diff --git a/it85spi.c b/it85spi.c
index 76e4861..f1ad22b 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -84,15 +84,15 @@
static int it85xx_scratch_rom_reenter = 0;
/* This function will poll the keyboard status register until either
- * an expected value shows up, or
- * timeout reaches.
+ * an expected value shows up, or the timeout is reached.
+ * timeout is in usec.
*
- * Returns: 0 -- the expected value has shown.
- * 1 -- timeout reached.
+ * Returns: 0 -- the expected value showed up.
+ * 1 -- timeout.
*/
static int wait_for(const unsigned int mask, const unsigned int expected_value,
- const int timeout /* in usec */, const char *error_message,
- const char *function_name, const int lineno)
+ const int timeout, const char * error_message,
+ const char * function_name, const int lineno)
{
int time_passed;
@@ -317,8 +317,9 @@
int i;
it85xx_enter_scratch_rom();
- /* exit scratch ROM ONLY when programmer shuts down. Otherwise, the
- * temporary flash state may halt EC. */
+ /* Exit scratch ROM ONLY when programmer shuts down. Otherwise, the
+ * temporary flash state may halt the EC.
+ */
#ifdef LPC_IO
INDIRECT_A1(shm_io_base, (((unsigned long int)ce_high) >> 8) & 0xff);