summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-19 19:12:39 +0100
committerMark Brown <broonie@linaro.org>2013-06-19 19:12:39 +0100
commit796170733e50405e3039eacdf5cfb2f08f3eb9ba (patch)
treefb0907067b0237e2a1054ca770c0b7dc6883c98d
parent7e9955567eadb83642be55e6ae5853412dd48d14 (diff)
downloadlinux-stable-796170733e50405e3039eacdf5cfb2f08f3eb9ba.tar.gz
linux-stable-796170733e50405e3039eacdf5cfb2f08f3eb9ba.tar.bz2
linux-stable-796170733e50405e3039eacdf5cfb2f08f3eb9ba.zip
spi/s3c64xx: Make wait_for_timeout() function name less generic
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-s3c64xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 0a806924b906..70b221355400 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -583,7 +583,7 @@ static inline void enable_cs(struct s3c64xx_spi_driver_data *sdd,
writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
}
-static u32 wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
+static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
int timeout_ms)
{
void __iomem *regs = sdd->regs;
@@ -676,7 +676,8 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
buf = xfer->rx_buf;
do {
/* wait for data to be received in the fifo */
- cpy_len = wait_for_timeout(sdd, (loops ? ms : 0));
+ cpy_len = s3c64xx_spi_wait_for_timeout(sdd,
+ (loops ? ms : 0));
switch (sdd->cur_bpw) {
case 32: