From patchwork Thu Sep 26 14:54:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20622 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2E04324687 for ; Thu, 26 Sep 2013 14:56:36 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id k15sf1238639qaq.2 for ; Thu, 26 Sep 2013 07:56:36 -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=d8nnv6z25ROIjTsgkkuQNzKhx9ipH4jNS9QxVWucHOo=; b=kgj8gDo+Qq4cGFOPpnyM/6MUridask6xvhbXxPsGZh/Vf07YTwdCObH2y65XQPEGdh weBx7dnsRGzcz2so1saDnlGTG8cIMgLG26q2+D/vsO+Fbcl1ul04ZdMb6bxQxjPHSwNl 9Uudp6AgDjgqXnefb97r4aAe7g18t4K1W+YX83Jeo5RvJehhvBfGpSZsKu9vtmBOgO8U J5Xh2Yu+lqDRGW6QmKc2Orx6fhNFVzmeM0TXUqMwG5NfKR3ZGWM3TkynYwgcD1mKj/0f XaxGCEDwgIJSmlnHj1JbUQuhsyPfhST3fkU1kJN2lgWm8SvIjxDkJjOkDpCibrSfLK+X cAjg== X-Gm-Message-State: ALoCoQl7wm7KXTjdfy1xIjtODqqJFtAgADbDcUtCSP+cA7TL7DB/Z+bdYhHTJPr+sz1AHcm2/XqH X-Received: by 10.236.24.195 with SMTP id x43mr255879yhx.3.1380207396020; Thu, 26 Sep 2013 07:56:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.5.9 with SMTP id o9ls991049qeo.49.gmail; Thu, 26 Sep 2013 07:56:35 -0700 (PDT) X-Received: by 10.220.174.200 with SMTP id u8mr1064227vcz.6.1380207395906; Thu, 26 Sep 2013 07:56:35 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id fx15si503552vec.34.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id db12so987565veb.14 for ; Thu, 26 Sep 2013 07:56:05 -0700 (PDT) X-Received: by 10.59.9.138 with SMTP id ds10mr1027097ved.5.1380207365799; Thu, 26 Sep 2013 07:56:05 -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.220.174.196 with SMTP id u4csp371139vcz; Thu, 26 Sep 2013 07:56:05 -0700 (PDT) X-Received: by 10.15.75.73 with SMTP id k49mr1961370eey.36.1380207364801; Thu, 26 Sep 2013 07:56:04 -0700 (PDT) Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by mx.google.com with ESMTPS id 7si1854533eeu.188.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:04 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.43 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.43; Received: by mail-ee0-f43.google.com with SMTP id e52so603917eek.2 for ; Thu, 26 Sep 2013 07:56:04 -0700 (PDT) X-Received: by 10.15.32.136 with SMTP id a8mr1855224eev.71.1380207364293; Thu, 26 Sep 2013 07:56:04 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id x47sm4813555eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:03 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Wei WANG , Samuel Ortiz Subject: [PATCH 21/27] mmc: rtsx: Remove redundant suspend and resume callbacks Date: Thu, 26 Sep 2013 16:54:46 +0200 Message-Id: <1380207292-16968-22-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> References: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Suspend and resume of cards are handled by the protocol layer and consequently the mmc_suspend|resume_host APIs are marked as deprecated. While moving away from using the deprecated APIs, there are nothing left to be done for the suspend and resume callbacks, so remove them. Cc: Wei WANG Cc: Samuel Ortiz Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_pci_sdmmc.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index e2ab124..c46feda 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c @@ -1197,37 +1197,6 @@ static const struct mmc_host_ops realtek_pci_sdmmc_ops = { .execute_tuning = sdmmc_execute_tuning, }; -#ifdef CONFIG_PM -static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev, - pm_message_t state) -{ - struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); - struct mmc_host *mmc = host->mmc; - int err; - - dev_dbg(sdmmc_dev(host), "--> %s\n", __func__); - - err = mmc_suspend_host(mmc); - if (err) - return err; - - return 0; -} - -static int rtsx_pci_sdmmc_resume(struct platform_device *pdev) -{ - struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); - struct mmc_host *mmc = host->mmc; - - dev_dbg(sdmmc_dev(host), "--> %s\n", __func__); - - return mmc_resume_host(mmc); -} -#else /* CONFIG_PM */ -#define rtsx_pci_sdmmc_suspend NULL -#define rtsx_pci_sdmmc_resume NULL -#endif /* CONFIG_PM */ - static void init_extra_caps(struct realtek_pci_sdmmc *host) { struct mmc_host *mmc = host->mmc; @@ -1367,8 +1336,6 @@ static struct platform_driver rtsx_pci_sdmmc_driver = { .probe = rtsx_pci_sdmmc_drv_probe, .remove = rtsx_pci_sdmmc_drv_remove, .id_table = rtsx_pci_sdmmc_ids, - .suspend = rtsx_pci_sdmmc_suspend, - .resume = rtsx_pci_sdmmc_resume, .driver = { .owner = THIS_MODULE, .name = DRV_NAME_RTSX_PCI_SDMMC,