From patchwork Thu Sep 26 14:54:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20614 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43F0124687 for ; Thu, 26 Sep 2013 14:56:14 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id j7sf1239363qaq.7 for ; Thu, 26 Sep 2013 07:56:14 -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=O72+TbtEXVYRrOH5wFr8DH7DNqt34SvzImROwELf14o=; b=kOS0HogEn25ju4kUwJGhHfCe5yLjWw8IAkgKy5AzV5bRaTNWE87xAqLJGH6AtE3V7K R3KbroSvktblnBnTPo7ZqTgGES6FEgjKhM8VodHxpEnW4oEAP4rPUXeBLCkTmal1kFJd /xpLIp+qkGLNGRGxU+Ldvek7n4ZxoSPH8ZGwDdxFMyFxXybqYkByCBA2vF0m5aWBS0wB AsHwurnu4962sv5pisWaopb4DcYCJsjZ4/aAIf1UyQS/CjywJWsOOm/RXLNjAyYsFBco AYezop3h6SezxenHvegW+jpQkR9zsfxh6CQ2rukUt3j7EjrKxdkwkHsEaGCmw5rKN17k vJpw== X-Gm-Message-State: ALoCoQlaOZoEO0CONcwrvJmD31l2tun64wIu05OQqdcB6F8le2Y0fvnYKLvK87t4yTYTpJo28abf X-Received: by 10.236.94.39 with SMTP id m27mr279806yhf.54.1380207374066; Thu, 26 Sep 2013 07:56:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.196 with SMTP id w4ls923094qen.71.gmail; Thu, 26 Sep 2013 07:56:13 -0700 (PDT) X-Received: by 10.58.165.4 with SMTP id yu4mr461037veb.39.1380207373962; Thu, 26 Sep 2013 07:56:13 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id dp7si491763ved.111.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 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.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so984535veb.17 for ; Thu, 26 Sep 2013 07:55:43 -0700 (PDT) X-Received: by 10.52.37.69 with SMTP id w5mr847122vdj.32.1380207343867; Thu, 26 Sep 2013 07:55:43 -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 u4csp371109vcz; Thu, 26 Sep 2013 07:55:43 -0700 (PDT) X-Received: by 10.14.181.194 with SMTP id l42mr1820800eem.63.1380207342955; Thu, 26 Sep 2013 07:55:42 -0700 (PDT) Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by mx.google.com with ESMTPS id x42si1833553eel.266.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:42 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.53 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.53; Received: by mail-ee0-f53.google.com with SMTP id b15so604770eek.26 for ; Thu, 26 Sep 2013 07:55:42 -0700 (PDT) X-Received: by 10.15.44.199 with SMTP id z47mr1933685eev.64.1380207342251; Thu, 26 Sep 2013 07:55:42 -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:41 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Jarkko Lavinen , linux-omap@vger.kernel.org Subject: [PATCH 13/27] mmc: omap: Remove redundant suspend and resume callbacks Date: Thu, 26 Sep 2013 16:54:38 +0200 Message-Id: <1380207292-16968-14-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.172 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: Jarkko Lavinen Cc: linux-omap@vger.kernel.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/omap.c | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index b94f38e..0b10a90 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -128,7 +128,6 @@ struct mmc_omap_slot { struct mmc_omap_host { int initialized; - int suspended; struct mmc_request * mrq; struct mmc_command * cmd; struct mmc_data * data; @@ -1513,61 +1512,9 @@ static int mmc_omap_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int mmc_omap_suspend(struct platform_device *pdev, pm_message_t mesg) -{ - int i, ret = 0; - struct mmc_omap_host *host = platform_get_drvdata(pdev); - - if (host == NULL || host->suspended) - return 0; - - for (i = 0; i < host->nr_slots; i++) { - struct mmc_omap_slot *slot; - - slot = host->slots[i]; - ret = mmc_suspend_host(slot->mmc); - if (ret < 0) { - while (--i >= 0) { - slot = host->slots[i]; - mmc_resume_host(slot->mmc); - } - return ret; - } - } - host->suspended = 1; - return 0; -} - -static int mmc_omap_resume(struct platform_device *pdev) -{ - int i, ret = 0; - struct mmc_omap_host *host = platform_get_drvdata(pdev); - - if (host == NULL || !host->suspended) - return 0; - - for (i = 0; i < host->nr_slots; i++) { - struct mmc_omap_slot *slot; - slot = host->slots[i]; - ret = mmc_resume_host(slot->mmc); - if (ret < 0) - return ret; - - host->suspended = 0; - } - return 0; -} -#else -#define mmc_omap_suspend NULL -#define mmc_omap_resume NULL -#endif - static struct platform_driver mmc_omap_driver = { .probe = mmc_omap_probe, .remove = mmc_omap_remove, - .suspend = mmc_omap_suspend, - .resume = mmc_omap_resume, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE,