Skip to content

Commit

Permalink
spi/s3c64xx: Make wait_for_timeout() function name less generic
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Mark Brown committed Jun 19, 2013
1 parent 7e99555 commit 7961707
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/spi/spi-s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 7961707

Please sign in to comment.