| From 81ed312fbb994257d636e6857849c4e5b0cdc4b0 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Thu, 20 Feb 2014 15:43:02 +0100 |
| Subject: 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> |
| (cherry picked from commit 6a85fc5af1f09982e50abe56efc70eda9ad24632) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-sh-msiof.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index cc12e755131d..af9f2db41b16 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -144,8 +144,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; |
| @@ -372,10 +371,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) |
| -- |
| 2.1.2 |
| |
