diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-11-09 04:28:50 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-16 12:44:21 -0500 |
commit | 4dde99bd32fc3f61f7c2b602a78f1627a118e450 (patch) | |
tree | c5129b9c0cb6b29399315a2f18332c0aea7ed754 | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) |
spi/bcm63xx: Move default clock configuration to kill compiler warning
drivers/spi/spi-bcm63xx.c: In function ‘bcm63xx_spi_setup_transfer’:
drivers/spi/spi-bcm63xx.c:207: warning: ‘clk_cfg’ may be used uninitialized in this function
While this is a false positive, it can easily be avoided by selecting
the default clock configuration first.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-bcm63xx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 06858e04ec59..cc8e1513d167 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c | |||
@@ -207,6 +207,9 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, | |||
207 | u8 clk_cfg, reg; | 207 | u8 clk_cfg, reg; |
208 | int i; | 208 | int i; |
209 | 209 | ||
210 | /* Default to lowest clock configuration */ | ||
211 | clk_cfg = SPI_CLK_0_391MHZ; | ||
212 | |||
210 | /* Find the closest clock configuration */ | 213 | /* Find the closest clock configuration */ |
211 | for (i = 0; i < SPI_CLK_MASK; i++) { | 214 | for (i = 0; i < SPI_CLK_MASK; i++) { |
212 | if (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) { | 215 | if (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) { |
@@ -215,10 +218,6 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, | |||
215 | } | 218 | } |
216 | } | 219 | } |
217 | 220 | ||
218 | /* No matching configuration found, default to lowest */ | ||
219 | if (i == SPI_CLK_MASK) | ||
220 | clk_cfg = SPI_CLK_0_391MHZ; | ||
221 | |||
222 | /* clear existing clock configuration bits of the register */ | 221 | /* clear existing clock configuration bits of the register */ |
223 | reg = bcm_spi_readb(bs, SPI_CLK_CFG); | 222 | reg = bcm_spi_readb(bs, SPI_CLK_CFG); |
224 | reg &= ~SPI_CLK_MASK; | 223 | reg &= ~SPI_CLK_MASK; |