spi/bcm63xx: Move default clock configuration to kill compiler warning
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 9 Nov 2015 09:28:50 +0000 (10:28 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 16 Nov 2015 17:44:21 +0000 (17:44 +0000)
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>
drivers/spi/spi-bcm63xx.c

index 06858e04ec59a8f2e290c398f6f06e2d1b15e28a..cc8e1513d167396dac1712eb29ac9efc1ea4051a 100644 (file)
@@ -207,6 +207,9 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
        u8 clk_cfg, reg;
        int i;
 
+       /* Default to lowest clock configuration */
+       clk_cfg = SPI_CLK_0_391MHZ;
+
        /* Find the closest clock configuration */
        for (i = 0; i < SPI_CLK_MASK; i++) {
                if (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) {
@@ -215,10 +218,6 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
                }
        }
 
-       /* No matching configuration found, default to lowest */
-       if (i == SPI_CLK_MASK)
-               clk_cfg = SPI_CLK_0_391MHZ;
-
        /* clear existing clock configuration bits of the register */
        reg = bcm_spi_readb(bs, SPI_CLK_CFG);
        reg &= ~SPI_CLK_MASK;