diff options
| author | Andy Shevchenko | 2015-10-14 23:12:21 +0300 |
|---|---|---|
| committer | Mark Brown | 2015-10-19 20:32:01 +0100 |
| commit | de6feda884b0079f5f232a41d94da23d198ff230 (patch) | |
| tree | 9125959d8251e458816f4ebbcc22448895b1f794 /drivers/spi | |
| parent | 863cb2f72e636c8721482fd88e256facb59c5737 (diff) | |
spi: dw: eliminate speed variable in ->transfer_one()
There is no point to have a separate variable for speed in ->transfer_one().
While here, remove !chip->clk_div from a condition since it is assigned
simultaneously with chip->speed_hz. We can do this safely because
a) transfer speed can't be higher than max_freq and therefore chip->clk_div
can be 0 only when chip->speed_hz is 0, and
b) transfer speed can't be 0, otherwise we will get division by zero
exception.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-dw.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index c8f7f161213d..a6fd7cfa1b40 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -285,8 +285,7 @@ static int dw_spi_transfer_one(struct spi_master *master, struct chip_data *chip = spi_get_ctldata(spi); u8 imask = 0; u16 txlevel = 0; - u16 clk_div = 0; - u32 speed = 0; + u16 clk_div; u32 cr0; int ret; @@ -301,14 +300,11 @@ static int dw_spi_transfer_one(struct spi_master *master, spi_enable_chip(dws, 0); /* Handle per transfer options for bpw and speed */ - speed = chip->speed_hz; - if ((transfer->speed_hz != speed) || !chip->clk_div) { - speed = transfer->speed_hz; - + if (transfer->speed_hz != chip->speed_hz) { /* clk_div doesn't support odd number */ - clk_div = (dws->max_freq / speed + 1) & 0xfffe; + clk_div = (dws->max_freq / transfer->speed_hz + 1) & 0xfffe; - chip->speed_hz = speed; + chip->speed_hz = transfer->speed_hz; chip->clk_div = clk_div; spi_set_clk(dws, chip->clk_div); |