diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-12-08 10:05:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:27:53 +0100 |
| commit | 45791cc9db1f0d1b229748e4e332096c136083ea (patch) | |
| tree | 67edf7cf9a78f44bb745d92e8169e7cffa49733c | |
| parent | 1548f21bd239946ae40ed81f1e07fe5b62f69586 (diff) | |
| download | barebox-45791cc9db1f0d1b229748e4e332096c136083ea.tar.gz barebox-45791cc9db1f0d1b229748e4e332096c136083ea.tar.xz | |
spi: mvebu: various non-critical improvements to armada_370_xp_spi_set_baudrate
- Initialize pdiv in declaration
- fix format specifiers
- simplify range check, pdiv can never be > 7
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/spi/mvebu_spi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c index 3298b608fb..63d8083b2d 100644 --- a/drivers/spi/mvebu_spi.c +++ b/drivers/spi/mvebu_spi.c @@ -128,22 +128,21 @@ static int mvebu_spi_set_baudrate(struct mvebu_spi *p, u32 speed) #if defined(CONFIG_ARCH_ARMADA_370) || defined(CONFIG_ARCH_ARMADA_XP) static int armada_370_xp_spi_set_baudrate(struct mvebu_spi *p, u32 speed) { - u32 pscl, pdiv, val; + u32 pscl, pdiv = 0, val; /* prescaler values: 1,2,3,...,15 */ pscl = DIV_ROUND_UP(clk_get_rate(p->clk), speed); /* additional prescaler divider: 1, 2, 4, 8, 16, 32, 64, 128 */ - pdiv = 0; while (pscl > 15 && pdiv <= 7) { pscl = DIV_ROUND_UP(pscl, 2); pdiv++; } - dev_dbg(p->master.dev, "%s: clk = %lu, speed = %u, pscl = %d, pdiv = %d\n", + dev_dbg(p->master.dev, "%s: clk = %lu, speed = %u, pscl = %u, pdiv = %u\n", __func__, clk_get_rate(p->clk), speed, pscl, pdiv); - if (pscl > 15 || pdiv > 7) + if (pscl > 15) return -EINVAL; val = readl(p->base + SPI_IF_CONFIG) & ~(IF_CLK_PRESCALE_MASK); |