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: 2948881 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2015BFF0B for ; Thu, 26 Sep 2013 14:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC108202AB for ; Thu, 26 Sep 2013 14:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0CFC201EA for ; Thu, 26 Sep 2013 14:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751093Ab3IZO7f (ORCPT ); Thu, 26 Sep 2013 10:59:35 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:44610 "EHLO mail-ee0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753295Ab3IZO4A (ORCPT ); Thu, 26 Sep 2013 10:56:00 -0400 Received: by mail-ee0-f42.google.com with SMTP id b45so610545eek.29 for ; Thu, 26 Sep 2013 07:55:58 -0700 (PDT) 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=o5OqxFlu/bu4EoZmND73VkPAt3FOqvNLj/PkYDFYa9g=; b=ZKbm8GZKckk34SK7ExCfIqiQxrk0fPr5PEDu4WtLHQJGrN+QDhkcayKKija5ZC+inm 0+nSNYpEtnKhKIy5dLA5EsdnW0ETbrmh1GtPSV/6KQ4vVPa98dk4+rO/B9plz4hwZRjv D1o6XijdxAGoHnRyrKbZ00reNx8T5rMMvcBkVCWZXhLEnJGxkoDRb6Ll0iWuS6iVL38u e6DGcwBYBNQXkMV49IpHCXZRoaTL4Vjpho+3Qf49/LF4z2SjzRRl6ROkzNjzQTJ4/Glz QD8sbyJkFdjbimXS+q9nxkSCG7vGSxsHrPHSU8nQSHUysTriAk4mipwOTJTfVTe7I91h MVNg== X-Gm-Message-State: ALoCoQnBLKQ1QZSDtcYb46pb7p9Gvzywnchsi7Q6AB0j0uVqpKqJTcuElZxoZ0cwAe4lY+vnyuqT 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 }, };