From patchwork Wed Jun 19 18:21:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 2751211 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E96619F39E for ; Wed, 19 Jun 2013 18:21:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E7602038C for ; Wed, 19 Jun 2013 18:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62405200F4 for ; Wed, 19 Jun 2013 18:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934659Ab3FSSVd (ORCPT ); Wed, 19 Jun 2013 14:21:33 -0400 Received: from cassiel.sirena.org.uk ([80.68.93.111]:33947 "EHLO cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934170Ab3FSSVd (ORCPT ); Wed, 19 Jun 2013 14:21:33 -0400 Received: from cpc2-sgyl4-0-0-cust177.18-2.cable.virginmedia.com ([82.42.102.178] helo=finisterre) by cassiel.sirena.org.uk with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1UpN0X-0006Hg-At; Wed, 19 Jun 2013 19:21:27 +0100 Received: from broonie by finisterre with local (Exim 4.80) (envelope-from ) id 1UpN0W-00033N-D4; Wed, 19 Jun 2013 19:21:24 +0100 From: Mark Brown To: Kukjin Kim , Girish K S Cc: Grant Likely , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Mark Brown Date: Wed, 19 Jun 2013 19:21:21 +0100 Message-Id: <1371666081-11699-1-git-send-email-broonie@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-SA-Exim-Connect-IP: 82.42.102.178 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Subject: [PATCH] spi/s3c64xx: Make wait_for_timeout() function name less generic X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:57:07 +0000) X-SA-Exim-Scanned: Yes (on cassiel.sirena.org.uk) Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Mark Brown --- drivers/spi/spi-s3c64xx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 0a80692..70b2213 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: