linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Griffin <peter.griffin@linaro.org>
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, lee.jones@linaro.org, patches@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	[thread overview]
Message-ID: <1407860069-12706-3-git-send-email-peter.griffin@linaro.org> (raw)
In-Reply-To: <1407860069-12706-1-git-send-email-peter.griffin@linaro.org>

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 <peter.griffin@linaro.org>
---
 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);
-- 
1.9.1

  parent reply	other threads:[~2014-08-12 16:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-12 16:14 [PATCH 0/5] MMC cleanup of dev_pm_ops and .owner Peter Griffin
2014-08-12 16:14 ` [PATCH 1/5] mmc: remove .owner field for drivers using module_platform_driver Peter Griffin
2014-08-18 14:19   ` Michal Simek
2014-08-21 13:11     ` Peter Griffin
2014-08-12 16:14 ` Peter Griffin [this message]
2014-08-12 16:14 ` [PATCH 3/5] mmc: dw_mmc-pltfm: Remove superflous #else condition on CONFIG_PM_SLEEP Peter Griffin
2014-08-12 16:14 ` [PATCH 5/5] mmc: sdhci-acpi.c: Use SET_RUNTIME_PM_OPS macro to set runtime pm callbacks Peter Griffin
     [not found] ` <1407860069-12706-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-08-12 16:14   ` [PATCH 4/5] mmc: sdhci-pci: " Peter Griffin
2014-08-18 12:38   ` [PATCH 0/5] MMC cleanup of dev_pm_ops and .owner Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407860069-12706-3-git-send-email-peter.griffin@linaro.org \
    --to=peter.griffin@linaro.org \
    --cc=balajitk@ti.com \
    --cc=baohua@kernel.org \
    --cc=chris@printf.net \
    --cc=ian.molton@codethink.co.uk \
    --cc=jarkko.lavinen@nokia.com \
    --cc=jh80.chung@samsung.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=michal.simek@xilinx.com \
    --cc=patches@linaro.org \
    --cc=spear-devel@list.st.com \
    --cc=swarren@wwwdotorg.org \
    --cc=tgih.jun@samsung.com \
    --cc=ulf.hansson@linaro.org \
    --cc=viresh.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).