From patchwork Thu Sep 26 14:54:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20610 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9C79124687 for ; Thu, 26 Sep 2013 14:56:02 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf1092521yho.2 for ; Thu, 26 Sep 2013 07:56:02 -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=BhLPvxGvbiW7MEL6+wRcXF1OYEY0SYagaV9TCcqMT+0=; b=dZdp1IFhakKn9H4DpdbqXA5LW4kzJTPZnJz2bKXB61AcGLWVxDiWyYxz4rHMlKurCv BTTaifXr2w0fBx22cJg9N88sxZdtkmXjRJ+TxUk/37kId8nnxNC6izQKrkf7FaqCF2o9 OrNUYMwp3mhy84Q7Y791E+zuyq3PnJnHXW1coeyNNAlJd9O5uN2RKPRW3L4lc5sqRQt8 9evpHcJoYAk3wb+e0nT/82viLwt7Ol3GepmaYHmKtESIin2HL3R6evDw/YojvxFBY2zz Mprs7dXszu5c2kLq81GcscQYVKD0Js2VLRZF/saSCbtbvp1rabBD8vWbUCOBsoh847eO d9dg== X-Gm-Message-State: ALoCoQl2TmsDsxSejPYQSSyP2920kiGiyvXzMLLHUf3UsxqaBW6C0GhJw9TfQOOOumnFJq+kynW2 X-Received: by 10.236.4.69 with SMTP id 45mr259485yhi.20.1380207362420; Thu, 26 Sep 2013 07:56:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.10 with SMTP id d10ls939316qej.19.gmail; Thu, 26 Sep 2013 07:56:02 -0700 (PDT) X-Received: by 10.58.151.132 with SMTP id uq4mr1062541veb.30.1380207362272; Thu, 26 Sep 2013 07:56:02 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id vr9si489797vcb.126.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lf11so910811vcb.21 for ; Thu, 26 Sep 2013 07:55:32 -0700 (PDT) X-Received: by 10.52.116.74 with SMTP id ju10mr879697vdb.20.1380207332148; Thu, 26 Sep 2013 07:55:32 -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 u4csp371096vcz; Thu, 26 Sep 2013 07:55:31 -0700 (PDT) X-Received: by 10.14.184.132 with SMTP id s4mr1903031eem.13.1380207331219; Thu, 26 Sep 2013 07:55:31 -0700 (PDT) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id q8si1854166eem.180.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:31 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id n15so616660ead.16 for ; Thu, 26 Sep 2013 07:55:30 -0700 (PDT) X-Received: by 10.14.198.197 with SMTP id v45mr1975561een.52.1380207330584; Thu, 26 Sep 2013 07:55:30 -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:29 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Nicolas Pitre , Thomas Petazzoni , Jason Cooper , Andrew Lunn Subject: [PATCH 09/27] mmc: mvsdio: Remove redundant suspend and resume callbacks Date: Thu, 26 Sep 2013 16:54:34 +0200 Message-Id: <1380207292-16968-10-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.220.176 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: Nicolas Pitre Cc: Thomas Petazzoni Cc: Jason Cooper Cc: Andrew Lunn Signed-off-by: Ulf Hansson --- drivers/mmc/host/mvsdio.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index a592407..22ba4d3 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -838,33 +838,6 @@ static int __exit mvsd_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int mvsd_suspend(struct platform_device *dev, pm_message_t state) -{ - struct mmc_host *mmc = platform_get_drvdata(dev); - int ret = 0; - - if (mmc) - ret = mmc_suspend_host(mmc); - - return ret; -} - -static int mvsd_resume(struct platform_device *dev) -{ - struct mmc_host *mmc = platform_get_drvdata(dev); - int ret = 0; - - if (mmc) - ret = mmc_resume_host(mmc); - - return ret; -} -#else -#define mvsd_suspend NULL -#define mvsd_resume NULL -#endif - static const struct of_device_id mvsdio_dt_ids[] = { { .compatible = "marvell,orion-sdio" }, { /* sentinel */ } @@ -873,8 +846,6 @@ MODULE_DEVICE_TABLE(of, mvsdio_dt_ids); static struct platform_driver mvsd_driver = { .remove = __exit_p(mvsd_remove), - .suspend = mvsd_suspend, - .resume = mvsd_resume, .driver = { .name = DRIVER_NAME, .of_match_table = mvsdio_dt_ids,