| From 78adfee5b79ef12d2cf9c189984028d4484aa31a Mon Sep 17 00:00:00 2001 |
| From: Axel Lin <axel.lin@ingics.com> |
| Date: Sun, 2 Mar 2014 22:30:32 +0800 |
| Subject: spi: sh-msiof: Kill sh_msiof_spi_bits and sh_msiof_spi_hz functions |
| |
| In the implementation of __spi_validate(), spi core will set transfer |
| bits_per_word and max speed as spi device default if it is not set for |
| this transfer. So we can remove the same implementation in this driver. |
| |
| Signed-off-by: Axel Lin <axel.lin@ingics.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit b14158603288b9d898716b41f2f0acb7d49dad2c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-sh-msiof.c | 25 ++----------------------- |
| 1 file changed, 2 insertions(+), 23 deletions(-) |
| |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index 1b59804b43ad..739eb2f12ecc 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -416,26 +416,6 @@ static void sh_msiof_spi_read_fifo_s32u(struct sh_msiof_spi_priv *p, |
| put_unaligned(swab32(sh_msiof_read(p, RFDR) >> fs), &buf_32[k]); |
| } |
| |
| -static int sh_msiof_spi_bits(struct spi_device *spi, struct spi_transfer *t) |
| -{ |
| - int bits; |
| - |
| - bits = t ? t->bits_per_word : 0; |
| - if (!bits) |
| - bits = spi->bits_per_word; |
| - return bits; |
| -} |
| - |
| -static u32 sh_msiof_spi_hz(struct spi_device *spi, struct spi_transfer *t) |
| -{ |
| - u32 hz; |
| - |
| - hz = t ? t->speed_hz : 0; |
| - if (!hz) |
| - hz = spi->max_speed_hz; |
| - return hz; |
| -} |
| - |
| static int sh_msiof_spi_setup(struct spi_device *spi) |
| { |
| struct device_node *np = spi->master->dev.of_node; |
| @@ -573,7 +553,7 @@ static int sh_msiof_transfer_one(struct spi_master *master, |
| int n; |
| bool swab; |
| |
| - bits = sh_msiof_spi_bits(spi, t); |
| + bits = t->bits_per_word; |
| |
| if (bits <= 8 && t->len > 15 && !(t->len & 3)) { |
| bits = 32; |
| @@ -623,8 +603,7 @@ static int sh_msiof_transfer_one(struct spi_master *master, |
| } |
| |
| /* setup clocks (clock already enabled in chipselect()) */ |
| - sh_msiof_spi_set_clk_regs(p, clk_get_rate(p->clk), |
| - sh_msiof_spi_hz(spi, t)); |
| + sh_msiof_spi_set_clk_regs(p, clk_get_rate(p->clk), t->speed_hz); |
| |
| /* transfer in fifo sized chunks */ |
| words = t->len / bytes_per_word; |
| -- |
| 2.1.2 |
| |