From patchwork Wed Jul 27 11:32:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9249705 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 B20C16077C for ; Wed, 27 Jul 2016 11:32:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3EAA27AC2 for ; Wed, 27 Jul 2016 11:32:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98FD927C2C; Wed, 27 Jul 2016 11:32:20 +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 4FA5727AC2 for ; Wed, 27 Jul 2016 11:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755771AbcG0LcT (ORCPT ); Wed, 27 Jul 2016 07:32:19 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:35643 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755718AbcG0LcT (ORCPT ); Wed, 27 Jul 2016 07:32:19 -0400 Received: by mail-lf0-f46.google.com with SMTP id f93so25146406lfi.2 for ; Wed, 27 Jul 2016 04:32:18 -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=FU2NsHn693Gy7JQGNI/Sj4kzAWjCyu7rRGOGwbmlBeg=; b=Kc/JUPya9DUUDODKyigzGn5S4ARcXbuu+x64SW9IzHNevXwq9fQ4x7L8Z6zOyzjQyt 13u3tn03qwyr1FyriuuwUdSa1H75+99qBcK+6y8v2HFdmgDBw4gbP7JxFUKqm7Vtgm0e NRMl2gUErwqM2/dWP3rjaNmkpvnJY/lbppyZk= 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=FU2NsHn693Gy7JQGNI/Sj4kzAWjCyu7rRGOGwbmlBeg=; b=ID0SaBLHYAvcNskihTqOUKGC6fMNlctbw75E+QAg8XCkF4teb9tKyCxEUBovcYSrUd 8HYnadgws0Rv80nq5CUjo4daOkre08evAuVYAOMRq2H3R6fed2G4ElMvh7SIaWf1rgFN EAORaRKKYb8Q1RKQ/mYI3IbIOPMYFjfaq9G35NpCpORF+RIky6hOHUjp/YcqllXVKc8+ C0WUmYDpmlhQP+s0EUn3BaaOoPApRuzJYvoADfsttpC5FCroEd/kCDU/7cuVo/cG9E6r iYKas2dwkswpii2zTmBLjMkf/HtsUTfZH0ZmfwjYje3vyZg947o0pkC47Ja4/KYqnOtG pr5A== X-Gm-Message-State: AEkoouuY9IPmtZD9en09ScGEUFwNl6ICinmWqP4pFaf4E1GsiRgP1qcTvHF+JlJ2cgKM8ttG X-Received: by 10.25.126.6 with SMTP id z6mr9734863lfc.155.1469619137464; Wed, 27 Jul 2016 04:32:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 04:32:16 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter Cc: Arnd Bergmann Subject: [PATCH 04/11] mmc: sdhci-pxav3: Remove non needed #ifdef CONFIG_PM for dev_pm_ops Date: Wed, 27 Jul 2016 13:32:00 +0200 Message-Id: <1469619127-29283-5-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 As the SET_SYSTEM_SLEEP_PM_OPS and the SET_RUNTIME_PM_OPS macro deals with the CONFIG_PM options when assigning the callbacks, it becomes redundant to control this when declaring the struct dev_pm_ops. Instead let's always declare it as it simplifies the code. Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-pxav3.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 3013250..dd1938d 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -583,24 +583,17 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) } #endif -#ifdef CONFIG_PM static const struct dev_pm_ops sdhci_pxav3_pmops = { SET_SYSTEM_SLEEP_PM_OPS(sdhci_pxav3_suspend, sdhci_pxav3_resume) SET_RUNTIME_PM_OPS(sdhci_pxav3_runtime_suspend, sdhci_pxav3_runtime_resume, NULL) }; -#define SDHCI_PXAV3_PMOPS (&sdhci_pxav3_pmops) - -#else -#define SDHCI_PXAV3_PMOPS NULL -#endif - static struct platform_driver sdhci_pxav3_driver = { .driver = { .name = "sdhci-pxav3", .of_match_table = of_match_ptr(sdhci_pxav3_of_match), - .pm = SDHCI_PXAV3_PMOPS, + .pm = &sdhci_pxav3_pmops, }, .probe = sdhci_pxav3_probe, .remove = sdhci_pxav3_remove,