[U-Boot] [PATCH 13/34] spi: mpc8xxx: Simplify if

Jagan Teki
2018-11-20T12:47:53Z

From: Mario Six <mario.six@gdsys.cc>

Instead of having a nested if block, just have two branches within the
overarching if block to eliminate one nesting level.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
drivers/spi/mpc8xxx_spi.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index da9e1e3f98..ca34570901 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -120,13 +120,11 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,

clrbits_be32(&spi->mode, SPI_MODE_EN);

- if (bitlen <= 16) {
- if (bitlen <= 4)
- clrsetbits_be32(&spi->mode, 0x00f00000,
- (3 << 20));
- else
- clrsetbits_be32(&spi->mode, 0x00f00000,
- ((bitlen - 1) << 20));
+ if (bitlen <= 4) {
+ clrsetbits_be32(&spi->mode, 0x00f00000, (3 << 20));
+ } else if (bitlen <= 16) {
+ clrsetbits_be32(&spi->mode, 0x00f00000,
+ ((bitlen - 1) << 20));
} else {
clrbits_be32(&spi->mode, 0x00f00000);
/* Set up the next iteration if sending > 32 bits */
--
2.18.0.321.gffc6fa0e3