diff options
| author | Geert Uytterhoeven <geert+renesas@linux-m68k.org> | 2014-02-20 15:43:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-22 12:11:07 +0900 |
| commit | 6a85fc5af1f09982e50abe56efc70eda9ad24632 (patch) | |
| tree | dcffe02a351029bb1718ec89aed200e3a03ad932 /drivers/spi/spi-sh-msiof.c | |
| parent | a669c11a0df07477afbfeb53bc9d8fc989d1ed59 (diff) | |
| download | linux-stable-6a85fc5af1f09982e50abe56efc70eda9ad24632.tar.gz linux-stable-6a85fc5af1f09982e50abe56efc70eda9ad24632.tar.bz2 linux-stable-6a85fc5af1f09982e50abe56efc70eda9ad24632.zip | |
spi: sh-msiof: Change hz from unsigned long to u32
Both spi_transfer.speed_hz and spi_master.max_speed_hz are u32
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 5eded247fce4..d0af05e96a2d 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -145,8 +145,7 @@ static struct { }; static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p, - unsigned long parent_rate, - unsigned long spi_hz) + unsigned long parent_rate, u32 spi_hz) { unsigned long div = 1024; size_t k; @@ -373,10 +372,9 @@ static int sh_msiof_spi_bits(struct spi_device *spi, struct spi_transfer *t) return bits; } -static unsigned long sh_msiof_spi_hz(struct spi_device *spi, - struct spi_transfer *t) +static u32 sh_msiof_spi_hz(struct spi_device *spi, struct spi_transfer *t) { - unsigned long hz; + u32 hz; hz = t ? t->speed_hz : 0; if (!hz) |