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: 9249709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2DE376077C for ; Wed, 27 Jul 2016 11:32:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2099927AC2 for ; Wed, 27 Jul 2016 11:32:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1529127C0F; Wed, 27 Jul 2016 11:32:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05E727AC2 for ; Wed, 27 Jul 2016 11:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755801AbcG0LcX (ORCPT ); Wed, 27 Jul 2016 07:32:23 -0400 Received: from mail-lf0-f49.google.com ([209.85.215.49]:35914 "EHLO mail-lf0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755777AbcG0LcW (ORCPT ); Wed, 27 Jul 2016 07:32:22 -0400 Received: by mail-lf0-f49.google.com with SMTP id g62so25074816lfe.3 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=Qqe0lCOhgF50iiU1JVw2WlZpicGcM0LCOTHKQyZWNy3aNnAVZH3AcEoK4eEnvm3IYr dKmgmBqb3iZIW2Q7aYWXZ+1xLNLYLXLr+zHZNh/Dwk9aRthteWfYB0mZWv89mvlqkwaG nh85YlL4dkVXsTEP9HuxMCK8cCXMCA5NomYDBa1W4bYuLC1rfelopjI2PCtnAjv/0bY5 zYcsUswDXR/JVg7xI5kiJkJrh+//RwjwiKcdeQUn2D1DlvIYIirX0rGRjS79s5HxOs5s pHpOHrz/kRofNH/plV5fgVuZ31XrI/uhO16pSX8wkblutOw+VuSIeyZoKbmySac9BGSi iEFg== X-Gm-Message-State: AEkoouvcZITjxy20BtaD12r8NN71qDxdpv1OFj9BZ0/V1Lmv5BvG03UXu53dn+BptC3xTWjm X-Received: by 10.46.1.162 with SMTP id f34mr10507571lji.22.1469619140897; Wed, 27 Jul 2016 04:32:20 -0700 (PDT) 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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,