spi: spi-ep93xx: don't bother calculating the divisors in ep93xx_spi_setup()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 2 Jul 2013 17:10:00 +0000 (10:10 -0700)
committerMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:37:14 +0000 (11:37 +0100)
The divisors needed to generate the SPI clock are calculated per
transfer based on the t->speed_hz. There is no reason to calculate
them in ep93xx_spi_setup().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-ep93xx.c

index cc2a2405bd1df5a2c28d519a0b2cf20328c0fe5d..6cdfc4036b75275a5430b28aa3045f9ab0d3b0b4 100644 (file)
@@ -136,7 +136,6 @@ struct ep93xx_spi {
 /**
  * struct ep93xx_spi_chip - SPI device hardware settings
  * @spi: back pointer to the SPI device
- * @rate: max rate in hz this chip supports
  * @div_cpsr: cpsr (pre-scaler) divider
  * @div_scr: scr divider
  * @ops: private chip operations
@@ -147,7 +146,6 @@ struct ep93xx_spi {
  */
 struct ep93xx_spi_chip {
        const struct spi_device         *spi;
-       unsigned long                   rate;
        u8                              div_cpsr;
        u8                              div_scr;
        struct ep93xx_spi_chip_ops      *ops;
@@ -315,18 +313,6 @@ static int ep93xx_spi_setup(struct spi_device *spi)
                spi_set_ctldata(spi, chip);
        }
 
-       if (spi->max_speed_hz != chip->rate) {
-               int err;
-
-               err = ep93xx_spi_calc_divisors(espi, chip, spi->max_speed_hz);
-               if (err != 0) {
-                       spi_set_ctldata(spi, NULL);
-                       kfree(chip);
-                       return err;
-               }
-               chip->rate = spi->max_speed_hz;
-       }
-
        ep93xx_spi_cs_control(spi, false);
        return 0;
 }