diff mbox series

[U-Boot,v2,46/78] cfi_flash: Add missing braces in blocks

Message ID	20171213071946.6181-46-mario.six@gdsys.cc
State	Superseded, archived
Delegated to:	Mario Six
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Mario Six <mario.six@gdsys.cc> To: U-Boot Mailing List <u-boot@lists.denx.de>, Wolfgang Denk <wd@denx.de>, Dirk Eibach <eibach@gdsys.cc>, Simon Glass <sjg@chromium.org>, Heiko Schocher <hs@denx.de>, Stefan Roese <sr@denx.de>, Jagan Teki <jagan@openedev.com>, Joe Hershberger <joe.hershberger@ni.com> Date: Wed, 13 Dec 2017 08:19:14 +0100 Message-Id: <20171213071946.6181-46-mario.six@gdsys.cc> In-Reply-To: <20171213071946.6181-1-mario.six@gdsys.cc> References: <20171213071946.6181-1-mario.six@gdsys.cc> Subject: [U-Boot] [PATCH v2 46/78] cfi_flash: Add missing braces in blocks Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[U-Boot,v2,01/78] mpc8308rdb: Fix style violation \| expand [U-Boot,v2,01/78] mpc8308rdb: Fix style violation [U-Boot,v2,02/78] mpc83xx: spd_sdram: Fix whitespace style violations [U-Boot,v2,03/78] mpc83xx: spd_sdram: Fix style violations [U-Boot,v2,04/78] include: dm: Fix 'devioe'/'devuce' typos [U-Boot,v2,05/78] lib: fdtdec: Fix whitespace style violations [U-Boot,v2,06/78] lib: fdtdec: Fix some style violations [U-Boot,v2,07/78] core: ofnode: Fix style violations [U-Boot,v2,08/78] core: read: Fix style violations [U-Boot,v2,09/78] core: Add {ofnode, dev}_translate_address functions [U-Boot,v2,10/78] core: Make device_is_compatible live-tree compatible [U-Boot,v2,11/78] clk: clk-uclass: Fix style violations [U-Boot,v2,12/78] clk: clk_fixed_rate: Fix style violation [U-Boot,v2,13/78] clk: Remove superfluous gd declarations [U-Boot,v2,14/78] spi: Fix style violation and improve code [U-Boot,v2,15/78] spi: Remove obsolete spi_base_setup_slave_fdt [U-Boot,v2,16/78] spi: Remove spi_flash_probe_fdt [U-Boot,v2,17/78] spi: Remove spi_setup_slave_fdt [U-Boot,v2,18/78] spi: Remove CONFIG_OF_SPI_FLASH [U-Boot,v2,19/78] spi: sf_probe: Fix style violations [U-Boot,v2,20/78] spi: spi-uclass: Fix style violations [U-Boot,v2,21/78] sf_probe: Merge spi_flash_probe_tail into spi_flash_probe [U-Boot,v2,22/78] net: tsec: Fix style violations [U-Boot,v2,23/78] net: tsec: Fix memory leak in error path [U-Boot,v2,24/78] net: tsec: Make live-tree compatible [U-Boot,v2,25/78] i2c: fsl_i2c: Fix style violations [U-Boot,v2,26/78] i2c: fsl_i2c: Remove inline declarations [U-Boot,v2,27/78] i2c: fsl_i2c: Make live-tree compatible [U-Boot,v2,28/78] gpio: pca953x_gpio: Fix style violations [U-Boot,v2,29/78] gpio: pca953x_gpio: Make live-tree compatible [U-Boot,v2,30/78] serial: ns16550: Fix style violation [U-Boot,v2,31/78] gdsys: Post ppc4xx removal cleanup [U-Boot,v2,32/78] net: phy: marvell: Fix style violations [U-Boot,v2,33/78] net: phy: marvell 88e151x: Fix handling of bare RGMII interface type [U-Boot,v2,34/78] cfi_flash: Fix space between function name and parenthesis [U-Boot,v2,35/78] cfi_flash: Fix style of pointer declarations [U-Boot,v2,36/78] cfi_flash: Fix Parenthesis spacing [U-Boot,v2,37/78] cfi_flash: Fix whitespace with casting [U-Boot,v2,38/78] cfi_flash: Fix indent of case statements [U-Boot,v2,39/78] cfi_flash: Fix spacing around casts/operators [U-Boot,v2,40/78] cfi_flash: Fix missing/superfluous lines [U-Boot,v2,41/78] cfi_flash: Remove braces for single-statement blocks [U-Boot,v2,42/78] cfi_flash: Fix logical continuations [U-Boot,v2,43/78] cfi_flash: Use __func__ macro instead of function name [U-Boot,v2,44/78] cfi_flash: Fix comment style [U-Boot,v2,45/78] cfi_flash: Remove unnecessary braces [U-Boot,v2,46/78] cfi_flash: Add missing braces in blocks [U-Boot,v2,47/78] cfi_flash: Fix spelling of "Unknown" [U-Boot,v2,48/78] cfi_flash: Fix else after break [U-Boot,v2,49/78] cfi_flash: Fix placement of brace [U-Boot,v2,50/78] cfi_flash: Remove return from void function [U-Boot,v2,51/78] cfi_flash: Remove assignments from if conditions [U-Boot,v2,52/78] cfi_flash: Use u8 pointers instead of void pointers [U-Boot,v2,53/78] cfi_flash: Fix strings split across lines [U-Boot,v2,54/78] cfi_flash: Rename camel-case variables [U-Boot,v2,55/78] flash: Fix spelling of "ERR_TIMOUT" [U-Boot,v2,56/78] cfi_flash: Bound-check index before array access [U-Boot,v2,57/78] cfi_flash: Fix long lines [U-Boot,v2,58/78] cfi_flash: Fix indention [U-Boot,v2,59/78] cfi_flash: Always define cfi_flash_num_flash_banks [U-Boot,v2,60/78] mtd: cfi_flash: Make live-tree compatible [U-Boot,v2,61/78] gpio: mpc85xx_gpio: Fix style violations [U-Boot,v2,62/78] gpio: mpc85xx: Rename driver file to mpc8xxx [U-Boot,v2,63/78] gpio: mpc8xxx: Rename Kconfig option, structures, and functions [U-Boot,v2,64/78] gpio: mpc8xxx: Make compatible with more SoCs [U-Boot,v2,65/78] mpc83xx: Prepare usage of DM gpio driver [U-Boot,v2,66/78] gpio: mpc8xxx: Make live-tree compatible [U-Boot,v2,67/78] cmd: mdio: Fix style violations [U-Boot,v2,68/78] common: board_f: Fix style violations [U-Boot,v2,69/78] common: board_r: Fix style violations [U-Boot,v2,70/78] gdsys: mpc8308: Fix style violations [U-Boot,v2,71/78] gdsys: mpc8308: Use shadow register for output GPIO values [U-Boot,v2,72/78] strider, hrcon: Reset CAT phy on CON2 module [U-Boot,v2,73/78] gdsys:phy: Adapt fixup_88e1518() to latest Release Notes [U-Boot,v2,74/78] phy: Fix style violations [U-Boot,v2,75/78] i2c: ihs_i2c: Prepare DM conversion [U-Boot,v2,76/78] i2c: ihs_i2c: Make DM compatible [U-Boot,v2,77/78] i2c: ihs_i2c: Factor out send_buffer method [U-Boot,v2,78/78] clk: Makefile: Sort entries alphabetically

Commit Message

Mario Six Dec. 13, 2017, 7:19 a.m. UTC

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---

v1 -> v2:
None

---
 drivers/mtd/cfi_flash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--
2.13.6

diff mbox series

Patch

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 0a24e9173a..53842443eb 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1154,10 +1154,12 @@  int flash_erase(flash_info_t *info, int s_first, int s_last)
 				st = flash_status_poll(info, &cword, dest,
 						       info->erase_blk_tout, "erase");
 				flash_unmap(info, sect, 0, dest);
-			} else
+			} else {
 				st = flash_full_status_check(info, sect,
 							     info->erase_blk_tout,
 							     "erase");
+			}
+
 			if (st)
 				rcode = 1;
 			else if (flash_verbose)