From patchwork Wed Jul 27 11:32:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 72858 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp251391qga; Wed, 27 Jul 2016 04:32:36 -0700 (PDT) X-Received: by 10.25.162.17 with SMTP id l17mr9953397lfe.125.1469619141235; Wed, 27 Jul 2016 04:32:21 -0700 (PDT) Return-Path: Received: from mail-lf0-x22a.google.com (mail-lf0-x22a.google.com. [2a00:1450:4010:c07::22a]) by mx.google.com with ESMTPS id 207si2974463lfk.129.2016.07.27.04.32.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jul 2016 04:32:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22a as permitted sender) client-ip=2a00:1450:4010:c07::22a; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22a as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22a.google.com with SMTP id b199so25207220lfe.0 for ; Wed, 27 Jul 2016 04:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IDn72ouhGXbl2/NlN24+3+mTAMqYt7AOq2y2ZYtJ5pI=; b=UTjp2QWlZyzurUwQJRbjs+ZEhuN5rtiPwwQ0LryoKoOfhKANvODsy/BHCuZiOIZwVL rhq1wavYVI96cWdWaEcoGnIxrdt8xGdvYhCVedfdKm+F3Zf3D8NL1bvo8SrFOkxz9Yx6 wC3lXYglSDCA00X3KakRY3dPBA5Y1VaxV+q+A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IDn72ouhGXbl2/NlN24+3+mTAMqYt7AOq2y2ZYtJ5pI=; b=b23y+ohX2hPHMgD2zlMZ3Cjwa7biVNIhhOyE7SS8cJLrLAmfZo0Y8gs7pv/32urush 4R1IxJH4xzNi13A0Na1ynBpdFo4SbFjeVEwui01nr4alyqaWDKwoIw/wGuZS257rszKt OnENHdtoW/JwIQ1JLkm/XDG1sFt+IW2AWp/AaZ5EOIIufBRgtLFhdSucSrCm6Pn4vjv4 bP/QkiYTtCYiOnDT2ssVlMqmdp85Ov6AYyCCkZR+Jgkyes6arCqu/Jw9FsH3OUE5fBJ7 S/NKTLLJbtQYDJta6cu6zINhgvMwuwHywTonv+LvBUDiLkDykOv590fx8JuZNiKhrnKD P9zQ== X-Gm-Message-State: AEkoouukVpoHhbhNPNSE4afQyYuj5FchdUfge7v4PV1N4zpPU/PVPaVX/4Dk6O/NNkYS7ivgkxs= X-Received: by 10.46.1.162 with SMTP id f34mr10507571lji.22.1469619140897; Wed, 27 Jul 2016 04:32:20 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-128-67.na.cust.bahnhof.se. [155.4.128.67]) by smtp.gmail.com with ESMTPSA id h62sm911164lji.28.2016.07.27.04.32.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 04:32:19 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter Cc: Arnd Bergmann Subject: [PATCH 06/11] mmc: sdhci-sirf: Remove non needed #ifdef CONFIG_PM* for dev_pm_ops Date: Wed, 27 Jul 2016 13:32:02 +0200 Message-Id: <1469619127-29283-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469619127-29283-1-git-send-email-ulf.hansson@linaro.org> References: <1469619127-29283-1-git-send-email-ulf.hansson@linaro.org> The SIMPLE_DEV_PM_OPS macro deals with the CONFIG_PM options when assigning the PM callbacks, thus it's not needed to control this when using the macro. By removing the non needed #ifdef, the code becomes a bit cleaner. Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-sirf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 1.9.1 diff --git a/drivers/mmc/host/sdhci-sirf.c b/drivers/mmc/host/sdhci-sirf.c index 34866f6..5d06863 100644 --- a/drivers/mmc/host/sdhci-sirf.c +++ b/drivers/mmc/host/sdhci-sirf.c @@ -260,9 +260,9 @@ static int sdhci_sirf_resume(struct device *dev) return sdhci_resume_host(host); } +#endif static SIMPLE_DEV_PM_OPS(sdhci_sirf_pm_ops, sdhci_sirf_suspend, sdhci_sirf_resume); -#endif static const struct of_device_id sdhci_sirf_of_match[] = { { .compatible = "sirf,prima2-sdhc" }, @@ -274,9 +274,7 @@ static struct platform_driver sdhci_sirf_driver = { .driver = { .name = "sdhci-sirf", .of_match_table = sdhci_sirf_of_match, -#ifdef CONFIG_PM_SLEEP .pm = &sdhci_sirf_pm_ops, -#endif }, .probe = sdhci_sirf_probe, .remove = sdhci_pltfm_unregister,