From patchwork Sun Feb 23 16:42:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3704361 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 A70DABF13A for ; Sun, 23 Feb 2014 16:43:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D50DA201C7 for ; Sun, 23 Feb 2014 16:43:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9C182012B for ; Sun, 23 Feb 2014 16:43:04 +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 1WHc8X-0003qw-0X; Sun, 23 Feb 2014 16:42:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHc8U-0005IX-Pm; Sun, 23 Feb 2014 16:42:38 +0000 Received: from mail-la0-f43.google.com ([209.85.215.43]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHc8R-0005ID-MW for linux-arm-kernel@lists.infradead.org; Sun, 23 Feb 2014 16:42:36 +0000 Received: by mail-la0-f43.google.com with SMTP id pv20so4563311lab.30 for ; Sun, 23 Feb 2014 08:42:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=utAJ7/4P38qjcHQDU3cA5Xu0f7aTjLHWys/CQ9PFNJI=; b=mUustpkDw6NealJ5/UoQZIgP32ZimOhGosmvBelUoR8e2viyPrV8+0+AAlc/lINBAN SAlEZMEyvj3o1wrpYgShIxZTyjp6otCt5j0ku3t+dAyOdyNUYVG/7jWTiJxaYazxo3WC rBeBTDHYluGAZPWJhFuIgwxE8QPAIm6cIrXRbWCyyXdK+drkBLYG9ZKeDGLx6WoaFQl0 s3nCSh9Ymf7k7ZXea8iKp5cDoRxh1MQHzYucRuVlqIYMejprZxLBXIc6RrMANuj4nyGp koh/HB2AwWR0Ypa/x+DI2xJEt2N2CT0P7pdu3fXHDEwzDfWp7yHFbNEwHTuFm1u+S2HG NVdA== X-Gm-Message-State: ALoCoQlHY1wjpQYMNxveKS79vVBAXyE8Mz3qB7VXebqkzQTaa9n8QcrkyFSzBzFdof2QIxI7b+Ar X-Received: by 10.112.38.4 with SMTP id c4mr4429191lbk.84.1393173730147; Sun, 23 Feb 2014 08:42:10 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id cu8sm15429124lbb.12.2014.02.23.08.42.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 08:42:09 -0800 (PST) From: Ulf Hansson To: Wolfram Sang , linux-i2c@vger.kernel.org Subject: [PATCH] i2c: nomadik: Silence compiler warning Date: Sun, 23 Feb 2014 17:42:06 +0100 Message-Id: <1393173726-29479-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140223_114235_904222_3D227B25 X-CRM114-Status: GOOD ( 10.67 ) X-Spam-Score: -2.6 (--) Cc: Linus Walleij , Ulf Hansson , linux-arm-kernel@lists.infradead.org, Alessandro Rubini 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=-4.7 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 Commit "i2c: nomadik: Fixup deployment of runtime PM" introduced a compiler warning for !CONFIG_PM. Let's fix it here. Signed-off-by: Ulf Hansson --- Wolfram, currently one of the queued patches for i2c nomadik introduced a compiler warning. I decided to add a fixup patch on top of these instead of you dropping them and me resending new versions of the already applied patches. If you think it's better to drop the queued patches and to resend new verions, please tell me. --- drivers/i2c/busses/i2c-nomadik.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 8082f5c..5f47454 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -895,7 +895,7 @@ static int nmk_i2c_resume_early(struct device *dev) } #endif -#if CONFIG_PM +#ifdef CONFIG_PM static int nmk_i2c_runtime_suspend(struct device *dev) { struct amba_device *adev = to_amba_device(dev);