From patchwork Mon Jun 1 09:14:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 49283 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9B366218FC for ; Mon, 1 Jun 2015 09:15:12 +0000 (UTC) Received: by lbcak1 with SMTP id ak1sf32903008lbc.2 for ; Mon, 01 Jun 2015 02:15:11 -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:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=voDEIy99NnofXfGv3f98XE+kgZ48nE10lzpXcvoaC5w=; b=Bh+akwnl/R8YVyzYeAV5L2q19hoN/waDEcYGx1AfEKxLx6k30Fc2jjj9U91+rvI4bV 58/R202q4iSQJX9i6DtBzUXCGQ5cLJVxC16n811Zasrf8GGjom5ANyi09RCksQhhJtpK QBuZ3ybG2SV3bevKB9s+eG0zC2xwinn8gEyu6TgQ56g8Kanclmvi0bKtcD8SuqoN6qrL 95cBjaYVX6Z7EYXyiq4xya2CrVoAZ21xrThPcVes5bg/Jfobu7CfyFigWoz3Kx9c65Zv gYFeEG6ikvrbbaPcORndtlDlQzgLBTZ1114/fBTDrUy2HaNMfJrlyrOSEAhowJSJJS7D +DEw== X-Gm-Message-State: ALoCoQmFCXWtwT4QxCSTiNXGvI1Q8aekJ16XIxuqRC+ksl07ju7JRcPScWJ2Nl/MPVcdE0uUJNvn X-Received: by 10.180.84.70 with SMTP id w6mr10784308wiy.4.1433150110947; Mon, 01 Jun 2015 02:15:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.36 with SMTP id ll4ls39388lac.36.gmail; Mon, 01 Jun 2015 02:15:10 -0700 (PDT) X-Received: by 10.112.211.134 with SMTP id nc6mr20032181lbc.52.1433150110790; Mon, 01 Jun 2015 02:15:10 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id oq3si11801957lbb.125.2015.06.01.02.15.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 02:15:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labpy14 with SMTP id py14so84731448lab.0 for ; Mon, 01 Jun 2015 02:15:10 -0700 (PDT) X-Received: by 10.152.21.136 with SMTP id v8mr20094615lae.19.1433150110687; Mon, 01 Jun 2015 02:15:10 -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.112.108.230 with SMTP id hn6csp2168710lbb; Mon, 1 Jun 2015 02:15:10 -0700 (PDT) X-Received: by 10.152.115.132 with SMTP id jo4mr20519984lab.102.1433150110330; Mon, 01 Jun 2015 02:15:10 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id rb8si11829070lbb.34.2015.06.01.02.15.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 02:15:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbcue7 with SMTP id ue7so80268285lbc.0 for ; Mon, 01 Jun 2015 02:15:09 -0700 (PDT) X-Received: by 10.152.115.132 with SMTP id jo4mr20519950lab.102.1433150109875; Mon, 01 Jun 2015 02:15:09 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id ef5sm1750426lac.30.2015.06.01.02.15.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 02:15:08 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/2] mmc: core: Remove redundant ->power_restore() callback for MMC Date: Mon, 1 Jun 2015 11:14:57 +0200 Message-Id: <1433150098-4995-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) 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: , Since the ->reset() callback is implemented for MMC, the ->power_restore() callback has become redundant, let's remove it. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index e519e31..e726903 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1910,17 +1910,6 @@ static int mmc_runtime_resume(struct mmc_host *host) return 0; } -static int mmc_power_restore(struct mmc_host *host) -{ - int ret; - - mmc_claim_host(host); - ret = mmc_init_card(host, host->card->ocr, host->card); - mmc_release_host(host); - - return ret; -} - int mmc_can_reset(struct mmc_card *card) { u8 rst_n_function; @@ -1958,7 +1947,7 @@ static int mmc_reset(struct mmc_host *host) mmc_set_initial_state(host); mmc_host_clk_release(host); - return mmc_power_restore(host); + return mmc_init_card(host, card->ocr, card); } static const struct mmc_bus_ops mmc_ops = { @@ -1968,7 +1957,6 @@ static const struct mmc_bus_ops mmc_ops = { .resume = mmc_resume, .runtime_suspend = mmc_runtime_suspend, .runtime_resume = mmc_runtime_resume, - .power_restore = mmc_power_restore, .alive = mmc_alive, .shutdown = mmc_shutdown, .reset = mmc_reset,