From patchwork Fri Mar 1 12:47:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2201621 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5E1FEDF24C for ; Fri, 1 Mar 2013 12:48:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750845Ab3CAMsH (ORCPT ); Fri, 1 Mar 2013 07:48:07 -0500 Received: from eu1sys200aog106.obsmtp.com ([207.126.144.121]:48898 "EHLO eu1sys200aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709Ab3CAMsG (ORCPT ); Fri, 1 Mar 2013 07:48:06 -0500 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob106.postini.com ([207.126.147.11]) with SMTP ID DSNKUTCjgc23YYHNWHl8/PH90cT+4Ys6pM6E@postini.com; Fri, 01 Mar 2013 12:48:06 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 441221E0; Fri, 1 Mar 2013 12:47:27 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id EA4194DEA; Fri, 1 Mar 2013 12:47:26 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 4E72E24C07C; Fri, 1 Mar 2013 13:47:20 +0100 (CET) Received: from steludxu1397.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 1 Mar 2013 13:47:26 +0100 From: Ulf Hansson To: , Chris Ball Cc: Johan Rudholm , Ulf Hansson Subject: [PATCH 1/3] mmc: core: Remove power_restore bus_ops for mmc and sd Date: Fri, 1 Mar 2013 13:47:13 +0100 Message-ID: <1362142035-8403-2-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1362142035-8403-1-git-send-email-ulf.hansson@stericsson.com> References: <1362142035-8403-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Ulf Hansson The mmc_power_restore|save_host API is only used by SDIO func drivers. SDIO func drivers are also moving towards use of runtime pm to accomplish the the same operation and since this API is not used for mmc and sd it makes sense to remove the corresponding bus_ops. Moreover, at least for eMMC the mmc bus_ops is broken, since no consideration is taken for mmc sleep and mmc power off notify. Signed-off-by: Ulf Hansson Acked-by: Maya Erez --- drivers/mmc/core/mmc.c | 14 -------------- drivers/mmc/core/sd.c | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index c8f3d6e..edc6bc4 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1445,18 +1445,6 @@ static int mmc_resume(struct mmc_host *host) return err; } -static int mmc_power_restore(struct mmc_host *host) -{ - int ret; - - host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200); - mmc_claim_host(host); - ret = mmc_init_card(host, host->ocr, host->card); - mmc_release_host(host); - - return ret; -} - static int mmc_sleep(struct mmc_host *host) { struct mmc_card *card = host->card; @@ -1494,7 +1482,6 @@ static const struct mmc_bus_ops mmc_ops = { .detect = mmc_detect, .suspend = NULL, .resume = NULL, - .power_restore = mmc_power_restore, .alive = mmc_alive, }; @@ -1505,7 +1492,6 @@ static const struct mmc_bus_ops mmc_ops_unsafe = { .detect = mmc_detect, .suspend = mmc_suspend, .resume = mmc_resume, - .power_restore = mmc_power_restore, .alive = mmc_alive, }; diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 9e645e1..b71d906 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1095,24 +1095,11 @@ static int mmc_sd_resume(struct mmc_host *host) return err; } -static int mmc_sd_power_restore(struct mmc_host *host) -{ - int ret; - - host->card->state &= ~MMC_STATE_HIGHSPEED; - mmc_claim_host(host); - ret = mmc_sd_init_card(host, host->ocr, host->card); - mmc_release_host(host); - - return ret; -} - static const struct mmc_bus_ops mmc_sd_ops = { .remove = mmc_sd_remove, .detect = mmc_sd_detect, .suspend = NULL, .resume = NULL, - .power_restore = mmc_sd_power_restore, .alive = mmc_sd_alive, }; @@ -1121,7 +1108,6 @@ static const struct mmc_bus_ops mmc_sd_ops_unsafe = { .detect = mmc_sd_detect, .suspend = mmc_sd_suspend, .resume = mmc_sd_resume, - .power_restore = mmc_sd_power_restore, .alive = mmc_sd_alive, };