]> git.karo-electronics.de Git - linux-beck.git/commitdiff
spi/s3c64xx: Make wait_for_timeout() function name less generic
authorMark Brown <broonie@linaro.org>
Wed, 19 Jun 2013 18:12:39 +0000 (19:12 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 19 Jun 2013 18:12:39 +0000 (19:12 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-s3c64xx.c

index 0a806924b90671e212ebad90f7680fe873109a2f..70b2213554001212c086643f2e97fb574d3bfc1e 100644 (file)
@@ -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: