From patchwork Thu Sep 26 14:54:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20620 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B877624687 for ; Thu, 26 Sep 2013 14:56:30 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id l13sf1073038qcy.1 for ; Thu, 26 Sep 2013 07:56:30 -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=o5OqxFlu/bu4EoZmND73VkPAt3FOqvNLj/PkYDFYa9g=; b=T9k/veNiQeJYJl4ja6DDWmNI/uFpl/XQ7I2jLWcxDI/bOgAI/5Y2irSwV/rFAmoEie GVjY82Q6WYgs/GSRoO47I9lteyCWQqUtWBxz7SAHdkAHKvJ4U+L0YRFOxJFeTUEMfXkD QbzQenNPERqiPqyoAgpdDBiLJ5LUn0wATlSOD4e322l0rEsYPI4RYSFulDW3XblBpbHT A9jnaDcsRAT4MmVV2KnmpW8txgqOuhzncLqKu5sJY5Xv/Xff1FNPZwwbewee1gopuJsd VQIAoSOZCuWdRDJIi5FqD+I2tu8VJbJ3IuniAKY/i5GbGqKe//lLsRmGf+vCRtkN9PSU 2UnQ== X-Gm-Message-State: ALoCoQmRw4gBoEqw/Ij8nnqDCeEHyq3HNmqKpaT+hZgS0++DQxx/I/wF6BPKSsmevVZt4p2Em2JP X-Received: by 10.236.186.101 with SMTP id v65mr257206yhm.12.1380207390573; Thu, 26 Sep 2013 07:56:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.39.193 with SMTP id r1ls952756qek.30.gmail; Thu, 26 Sep 2013 07:56:30 -0700 (PDT) X-Received: by 10.52.177.163 with SMTP id cr3mr185212vdc.49.1380207390439; Thu, 26 Sep 2013 07:56:30 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id v6si508011vet.0.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id db12so985022veb.22 for ; Thu, 26 Sep 2013 07:56:00 -0700 (PDT) X-Received: by 10.220.186.202 with SMTP id ct10mr1055306vcb.14.1380207360330; Thu, 26 Sep 2013 07:56:00 -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 u4csp371132vcz; Thu, 26 Sep 2013 07:55:59 -0700 (PDT) X-Received: by 10.14.241.74 with SMTP id f50mr1894979eer.29.1380207359338; Thu, 26 Sep 2013 07:55:59 -0700 (PDT) Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by mx.google.com with ESMTPS id 7si1875639eeu.98.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.174 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.174; Received: by mail-ea0-f174.google.com with SMTP id z15so611032ead.33 for ; Thu, 26 Sep 2013 07:55:58 -0700 (PDT) X-Received: by 10.15.102.71 with SMTP id bq47mr1935720eeb.66.1380207358816; Thu, 26 Sep 2013 07:55:58 -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:55:58 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 19/27] mmc: pxamci: Remove redundant suspend and resume callbacks Date: Thu, 26 Sep 2013 16:54:44 +0200 Message-Id: <1380207292-16968-20-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.177 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. Signed-off-by: Ulf Hansson --- drivers/mmc/host/pxamci.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 1956a3d..32fe113 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -880,35 +880,6 @@ static int pxamci_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int pxamci_suspend(struct device *dev) -{ - struct mmc_host *mmc = dev_get_drvdata(dev); - int ret = 0; - - if (mmc) - ret = mmc_suspend_host(mmc); - - return ret; -} - -static int pxamci_resume(struct device *dev) -{ - struct mmc_host *mmc = dev_get_drvdata(dev); - int ret = 0; - - if (mmc) - ret = mmc_resume_host(mmc); - - return ret; -} - -static const struct dev_pm_ops pxamci_pm_ops = { - .suspend = pxamci_suspend, - .resume = pxamci_resume, -}; -#endif - static struct platform_driver pxamci_driver = { .probe = pxamci_probe, .remove = pxamci_remove, @@ -916,9 +887,6 @@ static struct platform_driver pxamci_driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, .of_match_table = of_match_ptr(pxa_mmc_dt_ids), -#ifdef CONFIG_PM - .pm = &pxamci_pm_ops, -#endif }, };