From patchwork Mon Jun 1 09:14:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 49284 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 53CEB22B40 for ; Mon, 1 Jun 2015 09:15:13 +0000 (UTC) Received: by wibbk2 with SMTP id bk2sf21014365wib.2 for ; Mon, 01 Jun 2015 02:15:12 -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: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=alsrSD3jvmDcF0jbMYHsV6U7PyBxJ9g1tycbXCH9lX4=; b=XD1sMw25Musuv4IpOoSuqP6weC8VMk56WNWIo/bL4lA//4hD6bjjr7n5NfpH02bIiT xXKwQIRTMggF1ymQYv1IN+U5XoyB/N+hfMz/pCQoqyXpmux6oyhL3/L04h4vWoOC5M38 6S2AXxxXg+kPg3lcR4o0kcfoIL0MrewEB9otyzGt4JR93EuaWFtdcrcM9h5CINULmAJC JXlXqBzyXXOmlwH3yqY+ly6CG54U44FQo/abuwqX0lwb6nUhJJ+nuI00dy1COWtSdh9E 4j26p/HBhWpKC5O9qOTuOXQy/QgHgomdGbqIQpX1s90+0mMxLAioUb47riEX0SXw+Sxg rayw== X-Gm-Message-State: ALoCoQnAbgAwz5RsKYPc/uymzw6H9cjXhRAdpSfWRrZ1sFRpu6I2DUBLmJpxfJA07urd3M7tPID3 X-Received: by 10.180.19.72 with SMTP id c8mr10785896wie.2.1433150112544; Mon, 01 Jun 2015 02:15:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.100 with SMTP id j4ls621426lah.92.gmail; Mon, 01 Jun 2015 02:15:12 -0700 (PDT) X-Received: by 10.152.5.134 with SMTP id s6mr19246879las.99.1433150112387; Mon, 01 Jun 2015 02:15:12 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id w5si11816096laa.59.2015.06.01.02.15.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 02:15:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbqq2 with SMTP id qq2so80193210lbb.3 for ; Mon, 01 Jun 2015 02:15:12 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr10615615lac.41.1433150112307; Mon, 01 Jun 2015 02:15:12 -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 hn6csp2168728lbb; Mon, 1 Jun 2015 02:15:11 -0700 (PDT) X-Received: by 10.152.115.207 with SMTP id jq15mr12179217lab.119.1433150111928; Mon, 01 Jun 2015 02:15:11 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id e1si11828278lam.23.2015.06.01.02.15.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 02:15:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labko7 with SMTP id ko7so92862643lab.2 for ; Mon, 01 Jun 2015 02:15:11 -0700 (PDT) X-Received: by 10.152.43.110 with SMTP id v14mr19911927lal.4.1433150111681; Mon, 01 Jun 2015 02:15:11 -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.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 02:15:10 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 2/2] mmc: core: Remove redundant ->power_restore() callback for SD Date: Mon, 1 Jun 2015 11:14:58 +0200 Message-Id: <1433150098-4995-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433150098-4995-1-git-send-email-ulf.hansson@linaro.org> References: <1433150098-4995-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 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 SD, the ->power_restore() callback has become redundant, let's remove it. Signed-off-by: Ulf Hansson --- drivers/mmc/core/sd.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index b99e25b..4e7366a 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1164,21 +1164,10 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) return 0; } -static int mmc_sd_power_restore(struct mmc_host *host) -{ - int ret; - - mmc_claim_host(host); - ret = mmc_sd_init_card(host, host->card->ocr, host->card); - mmc_release_host(host); - - return ret; -} - static int mmc_sd_reset(struct mmc_host *host) { mmc_power_cycle(host, host->card->ocr); - return mmc_sd_power_restore(host); + return mmc_sd_init_card(host, host->card->ocr, host->card); } static const struct mmc_bus_ops mmc_sd_ops = { @@ -1188,7 +1177,6 @@ static const struct mmc_bus_ops mmc_sd_ops = { .runtime_resume = mmc_sd_runtime_resume, .suspend = mmc_sd_suspend, .resume = mmc_sd_resume, - .power_restore = mmc_sd_power_restore, .alive = mmc_sd_alive, .shutdown = mmc_sd_suspend, .reset = mmc_sd_reset,