From patchwork Thu Aug 3 01:44:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9878003 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 47847603F4 for ; Thu, 3 Aug 2017 01:45:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3919B2883C for ; Thu, 3 Aug 2017 01:45:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C0462883E; Thu, 3 Aug 2017 01:45:45 +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 CD2E82883E for ; Thu, 3 Aug 2017 01:45:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbdHCBpF (ORCPT ); Wed, 2 Aug 2017 21:45:05 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:27879 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751206AbdHCBpE (ORCPT ); Wed, 2 Aug 2017 21:45:04 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v731iOVq012846; Thu, 3 Aug 2017 10:44:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v731iOVq012846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1501724667; bh=M41oJd7A/SD4nSYVy1Ap5whEe3lcLnPDrvjFIpk6em4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rNdwxVz5YqZ547llH9p+goomivTHzOVIVNF4RBZt9jZxz3u1XG2A3R58MgIv8GzhV W4Lkui+D0DU8EnhM0+bRtzB/sbx2FCwy7nMfQVDSfAcziYVOYRo2yLgo3rWoT7lLND 9/mYKaIEw8CiTmcybkzkjMR0dgH/RhIIffYekPYqhw84sHsQ0+2U12Hs3aJnLfgVkf HF9czW/G15AgysPBLNiXNQ5u8OWiB93d/09ioOzoeux0/XftlGxkHFv5o2jRjXLAFE XEcnCB1nsQeEaafrZJwr0Qmoh126Df0ptR7uyEaG6F02VhQbfbDQl2zB3paqUpzXUO 54p2AkRaUUIMg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Piotr Sroka , Adrian Hunter , Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 2/4] mmc: sdhci: remove #indef CONFIG_PM around function declarations Date: Thu, 3 Aug 2017 10:44:14 +0900 Message-Id: <1501724656-12435-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501724656-12435-1-git-send-email-yamada.masahiro@socionext.com> References: <1501724656-12435-1-git-send-email-yamada.masahiro@socionext.com> 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 We need not surround declarations with #ifdef. Besides, drivers may want to call these from PM callbacks marked with __maybe_unused. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added drivers/mmc/host/sdhci.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 0469fa191493..773b38127da2 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -709,15 +709,11 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios); int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios); void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable); - -#ifdef CONFIG_PM int sdhci_suspend_host(struct sdhci_host *host); int sdhci_resume_host(struct sdhci_host *host); void sdhci_enable_irq_wakeups(struct sdhci_host *host); int sdhci_runtime_suspend_host(struct sdhci_host *host); int sdhci_runtime_resume_host(struct sdhci_host *host); -#endif - void sdhci_cqe_enable(struct mmc_host *mmc); void sdhci_cqe_disable(struct mmc_host *mmc, bool recovery); bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error,