From patchwork Tue Aug 12 16:14:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 35283 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f70.google.com (mail-oi0-f70.google.com [209.85.218.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED052203C5 for ; Tue, 12 Aug 2014 16:14:40 +0000 (UTC) Received: by mail-oi0-f70.google.com with SMTP id u20sf40379126oif.1 for ; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) 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:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=0shqLD6xDzK+yumzDjFRbzmpz6i1jNr6jwlBvgKmnkY=; b=SfVB5yW6kPFy07y+adnCRen99vbVBNp7/av8CyateePzbFhXPSkDmDfQQ3C+4l12KZ rJGLaLUQnpsOsojklKIlj8t690v1PLdn0t9IouQpScIyko+HoIR8nqd/uj/fUqc8ttzp F3SCEdsFZxbZcBu2EFEg3rWFnl1wwytZyK9kSK0ixaNlXYRh8vGveRYwpY/fYjgivH/I S/xFF3g24qiHNh1QBv0Ap0HFhFCd7SfgyqYILqBuRZC0FThHslqDpLRu7feOZ2j4z5/u LFRaLbMmqjN5QJS+LcFidl0kToDIcp4m7EkQRgb7PhdAnqnJubXQk5VY6GEu0W93lJf0 pXRw== X-Gm-Message-State: ALoCoQmWWhvZMEW+MEQ3Ij1JSvAlqngyP0KWETHjvvr2FPsDbnpTRJap/f5wiG/pm/Z2PktAI+PE X-Received: by 10.42.18.2 with SMTP id v2mr17679167ica.25.1407860080588; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.138 with SMTP id h10ls217225qgh.87.gmail; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) X-Received: by 10.52.88.74 with SMTP id be10mr1878236vdb.54.1407860080468; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id v2si8507882vck.65.2014.08.12.09.14.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so13690634vcb.3 for ; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) X-Received: by 10.221.47.9 with SMTP id uq9mr2100033vcb.48.1407860080363; Tue, 12 Aug 2014 09:14:40 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp261678vcb; Tue, 12 Aug 2014 09:14:39 -0700 (PDT) X-Received: by 10.195.13.79 with SMTP id ew15mr5887661wjd.19.1407860079194; Tue, 12 Aug 2014 09:14:39 -0700 (PDT) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by mx.google.com with ESMTPS id q8si31354146wja.159.2014.08.12.09.14.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 74.125.82.179 as permitted sender) client-ip=74.125.82.179; Received: by mail-we0-f179.google.com with SMTP id u57so10167364wes.38 for ; Tue, 12 Aug 2014 09:14:38 -0700 (PDT) X-Received: by 10.194.90.4 with SMTP id bs4mr6302794wjb.71.1407860078793; Tue, 12 Aug 2014 09:14:38 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id td10sm57731219wic.10.2014.08.12.09.14.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 09:14:38 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tgih.jun@samsung.com, jh80.chung@samsung.com, chris@printf.net, ulf.hansson@linaro.org, jarkko.lavinen@nokia.com, balajitk@ti.com, baohua@kernel.org, viresh.linux@gmail.com, ian.molton@codethink.co.uk, maxime.ripard@free-electrons.com, linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org, spear-devel@list.st.com, linux-tegra@vger.kernel.org, michal.simek@xilinx.com, swarren@wwwdotorg.org Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org Subject: [PATCH 2/5] mmc: dw_mmc-pci: Remove superflous #else condition on CONFIG_PM_SLEEP Date: Tue, 12 Aug 2014 17:14:26 +0100 Message-Id: <1407860069-12706-3-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407860069-12706-1-git-send-email-peter.griffin@linaro.org> References: <1407860069-12706-1-git-send-email-peter.griffin@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) 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: , As the code is using SIMPLE_DEV_PM_OPS helper, this compiles away to nothing if CONFIG_PM_SLEEP is disabled. Thus we don't need to #define the suspend/resume callbacks to NULL. Signed-off-by: Peter Griffin --- drivers/mmc/host/dw_mmc-pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c index f70546a..5523b84 100644 --- a/drivers/mmc/host/dw_mmc-pci.c +++ b/drivers/mmc/host/dw_mmc-pci.c @@ -95,9 +95,6 @@ static int dw_mci_pci_resume(struct device *dev) return dw_mci_resume(host); } -#else -#define dw_mci_pci_suspend NULL -#define dw_mci_pci_resume NULL #endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume);