From patchwork Fri Jun 28 21:35:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2802561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54957BF4A1 for ; Fri, 28 Jun 2013 21:41:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70B7720317 for ; Fri, 28 Jun 2013 21:41:56 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A3362030A for ; Fri, 28 Jun 2013 21:41:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsgQS-0007ui-V6; Fri, 28 Jun 2013 21:41:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsgQQ-0008Kt-Bj; Fri, 28 Jun 2013 21:41:50 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsgQO-0008Jz-1C for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2013 21:41:48 +0000 Received: by mail-pd0-f182.google.com with SMTP id r10so1274181pdi.41 for ; Fri, 28 Jun 2013 14:41:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=nEEsaNggzo+W8SqK8Pqxm+zPIAF/NT+g9Yxag86h2IQ=; b=iVvlBL0HrcreE3iwMKFYIjfYOHW+QtGm5cdCT3Yz5hxcD/efXBVecXuDKKzvVIiIZU 74kIuGhJTjiTk+5SkuJ3jG+/XmQKvIagZQEqaXX+IHrDEPcayFvL6vbseteUXIhlTDZ8 e8Vq+YKNn5mTdydZc0WanCS3K4PAl4nkBOawi0UFfJMzFfEoKpZGt5DXPxfE5Goqb/oR 0cEzYvJQqdOQ9R9HWllSZ1G2KU2dm9SQROIyU03ZzftRQeOOM0fpepZMI9yGxNA09EhI GyGzGuoAafBEKqPqRxY5iGlHyWnB41ZnlPu+uATA/oe17RuEdWetgJe/9Nir3IUjbwVw 2UIQ== X-Received: by 10.67.1.68 with SMTP id be4mr13101563pad.161.1372455355533; Fri, 28 Jun 2013 14:35:55 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id sq5sm10665152pab.11.2013.06.28.14.35.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Jun 2013 14:35:54 -0700 (PDT) From: Kevin Hilman To: Wolfram Sang , linux-i2c@vger.kernel.org Subject: [PATCH] i2c: iop3xxx: fix build failure after waitqueue changes Date: Fri, 28 Jun 2013 14:35:52 -0700 Message-Id: <1372455352-26260-1-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.3 X-Gm-Message-State: ALoCoQkcdplfeThdIpyq2DHN0yEWfUK1P+cB6yt105RNcuhVFNxDSQBvWRQ6yzUOPmYFq1BUj55B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130628_174148_144705_C683F546 X-CRM114-Status: GOOD ( 12.03 ) X-Spam-Score: -1.9 (-) Cc: Olof Johansson , linaro-kernel@lists.linaro.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There has long been a syntax problem in iop3xx_i2c_wait_event() which has been somehow hidden by the macros in . After some recent cleanup/rework of the wait_event_* helpers, the bug has come out from hiding and now results in build failure: /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c: In function 'iop3xx_i2c_wait_event': /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:143: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:157: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:213: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:291: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:551: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:565: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:764: error: expected ')' before ';' token /work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:778: error: expected ')' b Fix by removing stray ';' Signed-off-by: Kevin Hilman --- Discovered in new build failure of iop32xx_defconfig with next-20130628 drivers/i2c/busses/i2c-iop3xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index bc99333..dd24aa0 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -176,7 +176,7 @@ iop3xx_i2c_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap, interrupted = wait_event_interruptible_timeout ( iop3xx_adap->waitq, (done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap) ,flags )), - 1 * HZ; + 1 * HZ ); if ((rc = iop3xx_i2c_error(sr)) < 0) { *status = sr;