commit 860875a03ad3c6f5a5ec6b8eea31835de2eeac24
author Patrick Georgi <pgeorgi@google.com> Fri Feb 03 17:44:55 2017
committer chrome-bot <chrome-bot@chromium.org> Mon Apr 10 23:54:29 2017
tree 971e7d6256ab169170c51f3782e3e634b30c2602
parent f3fa2997fb69e566e59dedce93eab972d3436597

Another cosmetic alignment with upstream

BUG=chromium:478356
BRANCH=none
TEST=still builds

Change-Id: If8aaf96053697118f3a68d3bd03ff2602d52a254
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/437365
Commit-Ready: Martin Roth <martinroth@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>

chipdrivers.h

diff --git a/chipdrivers.h b/chipdrivers.h
index d853d3a..184d589 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -38,10 +38,10 @@
 int spi_write_disable(struct flashctx *flash);
 int spi_block_erase_20(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_block_erase_52(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
-int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
-int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_block_erase_60(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_block_erase_c7(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
+int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
+int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
 int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len);

w29ee011.c

diff --git a/w29ee011.c b/w29ee011.c
index 6754ecb..4df4687 100644
--- a/w29ee011.c
+++ b/w29ee011.c
@@ -33,8 +33,7 @@
 		msg_cdbg("Old Winbond W29* probe method disabled because "
 			 "the probing sequence puts the AMIC A49LF040A in "
 			 "a funky state. Use 'flashrom -c %s' if you "
-			 "have a board with such a chip.\n",
-			 flash->chip->name);
+			 "have a board with such a chip.\n", flash->chip->name);
 		return 0;
 	}