From patchwork Tue Aug 12 16:14:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 35284 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C67DD203C5 for ; Tue, 12 Aug 2014 16:14:43 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf66420541pdj.4 for ; Tue, 12 Aug 2014 09:14:43 -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=nlGLwbFr6qBBKI5lduI14GH3vtsytSLjGkiJVllrseM=; b=L6Sc0AJgjnrNKaf+GAgSPVfp09xoaiVeeaKIE8E44+4VCozy8677so3plE7+PlmU6u 25AzxcqSrfjWEWgQhlyXH/p2TreilJljDQpd3R26tZiWtzMjP8vTs7Y1ANHGVozVooYG zSQnSvVfQs5Ze91ifTZWBwzqQpPOIFVPjtEf68q9BgMtJf2IP32zcR6Ks15pOFdDGBYb aEYjGWiV717dBLY2GJFUp/E3LJMb7/C6wukwEV5gZtI9/u7jPL5yyEjsO2PkM0G0O9DA T3sNpG6SfE6delCHSUH+IU4Z7eZpMgljWLm/k7CV8hrfHz1hOqbxmgaKBNdhCxXhCXDj vFTQ== X-Gm-Message-State: ALoCoQnbdukp//3c1A0celI66Pc4LZ5pKsIieKXkpbJfZV5nHBORZBz3Lmb21ofjdtc6q6p7I5a1 X-Received: by 10.68.189.73 with SMTP id gg9mr2805909pbc.4.1407860083128; Tue, 12 Aug 2014 09:14:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.240 with SMTP id n103ls213298qgd.13.gmail; Tue, 12 Aug 2014 09:14:43 -0700 (PDT) X-Received: by 10.220.189.3 with SMTP id dc3mr1759311vcb.64.1407860083016; Tue, 12 Aug 2014 09:14:43 -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 s5si8521414vcu.2.2014.08.12.09.14.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:42 -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 im17so13616618vcb.17 for ; Tue, 12 Aug 2014 09:14:42 -0700 (PDT) X-Received: by 10.220.187.134 with SMTP id cw6mr1758514vcb.71.1407860082923; Tue, 12 Aug 2014 09:14:42 -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 tc5csp261686vcb; Tue, 12 Aug 2014 09:14:42 -0700 (PDT) X-Received: by 10.194.103.38 with SMTP id ft6mr6001457wjb.18.1407860081651; Tue, 12 Aug 2014 09:14:41 -0700 (PDT) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by mx.google.com with ESMTPS id t9si22920188wiw.26.2014.08.12.09.14.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:41 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; Received: by mail-wi0-f176.google.com with SMTP id bs8so6114750wib.9 for ; Tue, 12 Aug 2014 09:14:41 -0700 (PDT) X-Received: by 10.194.84.69 with SMTP id w5mr6326197wjy.0.1407860081145; Tue, 12 Aug 2014 09:14:41 -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.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 09:14:40 -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 3/5] mmc: dw_mmc-pltfm: Remove superflous #else condition on CONFIG_PM_SLEEP Date: Tue, 12 Aug 2014 17:14:27 +0100 Message-Id: <1407860069-12706-4-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-pltfm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index d4a47a9..fbcb5a3 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -84,9 +84,6 @@ static int dw_mci_pltfm_resume(struct device *dev) return dw_mci_resume(host); } -#else -#define dw_mci_pltfm_suspend NULL -#define dw_mci_pltfm_resume NULL #endif /* CONFIG_PM_SLEEP */ SIMPLE_DEV_PM_OPS(dw_mci_pltfm_pmops, dw_mci_pltfm_suspend, dw_mci_pltfm_resume);