aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-19 14:12:39 -0400
committerMark Brown <broonie@linaro.org>2013-06-19 14:12:39 -0400
commit796170733e50405e3039eacdf5cfb2f08f3eb9ba (patch)
treefb0907067b0237e2a1054ca770c0b7dc6883c98d /drivers/spi
parent7e9955567eadb83642be55e6ae5853412dd48d14 (diff)
spi/s3c64xx: Make wait_for_timeout() function name less generic
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-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,
583 writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL); 583 writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
584} 584}
585 585
586static u32 wait_for_timeout(struct s3c64xx_spi_driver_data *sdd, 586static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
587 int timeout_ms) 587 int timeout_ms)
588{ 588{
589 void __iomem *regs = sdd->regs; 589 void __iomem *regs = sdd->regs;
@@ -676,7 +676,8 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
676 buf = xfer->rx_buf; 676 buf = xfer->rx_buf;
677 do { 677 do {
678 /* wait for data to be received in the fifo */ 678 /* wait for data to be received in the fifo */
679 cpy_len = wait_for_timeout(sdd, (loops ? ms : 0)); 679 cpy_len = s3c64xx_spi_wait_for_timeout(sdd,
680 (loops ? ms : 0));
680 681
681 switch (sdd->cur_bpw) { 682 switch (sdd->cur_bpw) {
682 case 32: 683 case 32: