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: 2948991 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4DBE79F288 for ; Thu, 26 Sep 2013 15:01:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D32320219 for ; Thu, 26 Sep 2013 15:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73582202AB for ; Thu, 26 Sep 2013 15:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176Ab3IZPBH (ORCPT ); Thu, 26 Sep 2013 11:01:07 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:35219 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753192Ab3IZOzn (ORCPT ); Thu, 26 Sep 2013 10:55:43 -0400 Received: by mail-ee0-f50.google.com with SMTP id d51so594365eek.23 for ; Thu, 26 Sep 2013 07:55:42 -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=O72+TbtEXVYRrOH5wFr8DH7DNqt34SvzImROwELf14o=; b=Fi/+XHVgjGamldp0i7vTAAp7H3R63gw4gRjxXbWzqYLwprKZcn8XvTlzmiWZe16fZw uVoiG2P5NZ/e4tzsGTYyuushob4ThG8yeitUSuEM4P4+5SMXB/fCcQ9WIyr3yB3rB359 ZbLrDWCjCZzV3Cn7E8gdoxs+lRuORyF5RLWCXPid0Sg9B25DKazO2aI0ibw2jId74BkP AGS9v4wp2irtVsaUzRdvaCIV20xJXySmnyaUo2L+75Ne1kpJSn17NHh2nXa9z/Aic8TE zCYFcgxUBQiNi4+a9JYHrk6lP6SSIljF9pqF4GwYPtcKXIBzILwofDrL2+GsyCW/lwlM IsCQ== X-Gm-Message-State: ALoCoQmL2JvTlWcHZVRZmxfZXkC7y+HcLDSunK2vUjCOCAg3hJJhVbqJlBODFH+COXam7xKKtLCe 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> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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=unavailable 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. 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,