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: 25143 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DB02020143 for ; Sun, 23 Feb 2014 16:42:13 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf3091048pdj.3 for ; Sun, 23 Feb 2014 08:42:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=utAJ7/4P38qjcHQDU3cA5Xu0f7aTjLHWys/CQ9PFNJI=; b=nLDHKE2V7IeDVI3zVHt7Kfh7alDC08L4HKdUfcjpvXI7e7uiLYS6/ZX3hipe80klmm iiU0UYNaySAMlSY9ZVfztZGf/BefvNgfzLQbbmX7dXT+9odfYTGfeDiT6Hl9ci7z/cDj G4//LgZZwyexQ4jKqO9+WkVaAm1rX7zjAe/WA0aU5rKgA85pgh6oWIPUWc3ZlxeQ12S9 LX8gaIvMEljcWRj0UARpHAZ7di8hF4xUNnI3e8PhGBkdNg2KLlyrLy19WbZZtlCm48yF 9TytNFFAmU8TKL7N7pQMUGciKwKGv5BkvvKSXvqseW7JjeRSkTZQvF4Nk3ExTsQZWRmL W1vg== X-Gm-Message-State: ALoCoQknXI14EdrOqZEVQeeZ3N5Pm4Lo4rToUpNGNFaYUpJDTI8hlDA9j1scJAHxWD1+rKvc8Lg4 X-Received: by 10.66.183.239 with SMTP id ep15mr8985368pac.7.1393173732957; Sun, 23 Feb 2014 08:42:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.136 with SMTP id 8ls1707930qgl.27.gmail; Sun, 23 Feb 2014 08:42:12 -0800 (PST) X-Received: by 10.220.10.2 with SMTP id n2mr10068897vcn.26.1393173732792; Sun, 23 Feb 2014 08:42:12 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id sg4si5099181vcb.86.2014.02.23.08.42.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 08:42:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id c14so575867vea.29 for ; Sun, 23 Feb 2014 08:42:12 -0800 (PST) X-Received: by 10.52.246.227 with SMTP id xz3mr8572303vdc.95.1393173732715; Sun, 23 Feb 2014 08:42:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp9196vcz; Sun, 23 Feb 2014 08:42:11 -0800 (PST) X-Received: by 10.152.206.42 with SMTP id ll10mr1592197lac.16.1393173730962; Sun, 23 Feb 2014 08:42:10 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx.google.com with ESMTPS id sz1si20601978lbb.34.2014.02.23.08.42.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Feb 2014 08:42:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.54 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id mc6so964415lab.41 for ; Sun, 23 Feb 2014 08:42:10 -0800 (PST) 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 Cc: Linus Walleij , Alessandro Rubini , linux-arm-kernel@lists.infradead.org, Ulf Hansson 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);