diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 12:51:39 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 12:51:39 +0400 |
| commit | 5b380cb1522e774e2fd67392532963426a749ce8 (patch) | |
| tree | f8d0fcbebb14c387ed4dd71509aaa7af5a5ca9df /drivers/spi | |
| parent | 84b61465645fc075ab1128ebd4c34f6905037634 (diff) | |
| parent | e91d2352bb6ebd061b362b3c632ec517ac0c23b1 (diff) | |
| download | linux-5b380cb1522e774e2fd67392532963426a749ce8.tar.xz | |
Merge remote-tracking branch 'spi/topic/tegra' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra114.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index bb3a19f2ed39..b3821fb9da3f 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -267,7 +267,7 @@ static unsigned tegra_spi_calculate_curr_xfer_param( unsigned max_len; unsigned total_fifo_words; - tspi->bytes_per_word = (bits_per_word - 1) / 8 + 1; + tspi->bytes_per_word = DIV_ROUND_UP(bits_per_word, 8); if (bits_per_word == 8 || bits_per_word == 16) { tspi->is_packed = 1; diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index a68d7797a8ec..79be8ce6a9d1 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -173,7 +173,7 @@ static unsigned tegra_sflash_calculate_curr_xfer_param( unsigned remain_len = t->len - tsd->cur_pos; unsigned max_word; - tsd->bytes_per_word = (t->bits_per_word - 1) / 8 + 1; + tsd->bytes_per_word = DIV_ROUND_UP(t->bits_per_word, 8); max_word = remain_len / tsd->bytes_per_word; if (max_word > SPI_FIFO_DEPTH) max_word = SPI_FIFO_DEPTH; diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 829283e785d9..c74ee87b243b 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -283,7 +283,7 @@ static unsigned tegra_slink_calculate_curr_xfer_param( unsigned total_fifo_words; bits_per_word = t->bits_per_word; - tspi->bytes_per_word = (bits_per_word - 1) / 8 + 1; + tspi->bytes_per_word = DIV_ROUND_UP(bits_per_word, 8); if (bits_per_word == 8 || bits_per_word == 16) { tspi->is_packed = 1; |