From patchwork Tue Aug 12 16:14:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 35285 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B43FE203C5 for ; Tue, 12 Aug 2014 16:14:45 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id c9sf11241551qcz.0 for ; Tue, 12 Aug 2014 09:14:45 -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=u/bWR2qWyO6M3uqFnePA8Zv9CsZt9QKqPlOF4BKTUIU=; b=TfR9CWh3R7HE59eBHcp7OraOBvywnpP5ee/9YEHcE8T7BjrUd1v1KDBihmASzi/HYJ tuJcsnJRIZztDV7gVpJdfxGa/pSZH9KAcZamZE9MPOEZCr3nS8y1/4C3yqaqBXo15CkA o90uYHHqkI812Tn9BRO4xC8NvTeZoaRHjy1Z3M7VRmrmi6u9G/akpTQjsyHmAiiv8+4a /6VDZhAYBd+8zgc6LNgjqUnDUr+VoXXFUCxdJXLqWcZKubrjvdc9jhtIF2CJv4aJ5KsO prEyvO8cUNSD+wVcZ2vnSg1khuPygGGOdi5lh17nBe/1DFtMuXIjOyMdluW9wJXnLB92 J3DQ== X-Gm-Message-State: ALoCoQmW3lOs3kivqm/nM9hdQcAStd4KvNJUzxI24vr5FxMuiGSMg0bHsOnhY/6CTH1r+5piFLSl X-Received: by 10.236.122.236 with SMTP id t72mr17542760yhh.15.1407860085565; Tue, 12 Aug 2014 09:14:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.6 with SMTP id s6ls223328qgd.22.gmail; Tue, 12 Aug 2014 09:14:45 -0700 (PDT) X-Received: by 10.52.179.161 with SMTP id dh1mr1484436vdc.78.1407860085402; Tue, 12 Aug 2014 09:14:45 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id u6si8510067vco.53.2014.08.12.09.14.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so13781438vcb.27 for ; Tue, 12 Aug 2014 09:14:45 -0700 (PDT) X-Received: by 10.52.73.202 with SMTP id n10mr1453459vdv.86.1407860085335; Tue, 12 Aug 2014 09:14:45 -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 tc5csp261689vcb; Tue, 12 Aug 2014 09:14:44 -0700 (PDT) X-Received: by 10.180.86.8 with SMTP id l8mr13013269wiz.18.1407860084025; Tue, 12 Aug 2014 09:14:44 -0700 (PDT) Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by mx.google.com with ESMTPS id uk5si2342405wjc.61.2014.08.12.09.14.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 09:14:44 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 74.125.82.174 as permitted sender) client-ip=74.125.82.174; Received: by mail-we0-f174.google.com with SMTP id x48so10241721wes.33 for ; Tue, 12 Aug 2014 09:14:43 -0700 (PDT) X-Received: by 10.194.189.230 with SMTP id gl6mr6179106wjc.118.1407860083540; Tue, 12 Aug 2014 09:14:43 -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.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 09:14:42 -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 4/5] mmc: sdhci-pci: Use SET_RUNTIME_PM_OPS macro to set runtime pm callbacks Date: Tue, 12 Aug 2014 17:14:28 +0100 Message-Id: <1407860069-12706-5-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.182 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: , This allows us to get rid of the #else condition, as the macro compiles away to nothing if not enabled. Signed-off-by: Peter Griffin --- drivers/mmc/host/sdhci-pci.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 52c42fc..745629d 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -1267,20 +1267,13 @@ static int sdhci_pci_runtime_idle(struct device *dev) return 0; } -#else - -#define sdhci_pci_runtime_suspend NULL -#define sdhci_pci_runtime_resume NULL -#define sdhci_pci_runtime_idle NULL - #endif static const struct dev_pm_ops sdhci_pci_pm_ops = { .suspend = sdhci_pci_suspend, .resume = sdhci_pci_resume, - .runtime_suspend = sdhci_pci_runtime_suspend, - .runtime_resume = sdhci_pci_runtime_resume, - .runtime_idle = sdhci_pci_runtime_idle, + SET_RUNTIME_PM_OPS(sdhci_pci_runtime_suspend, + sdhci_pci_runtime_resume, sdhci_pci_runtime_idle) }; /*****************************************************************************\