From patchwork Tue Mar 29 07:31:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 8683221 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B6C6C9FDCC for ; Tue, 29 Mar 2016 07:31:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6F282015A for ; Tue, 29 Mar 2016 07:31:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86AC62020F for ; Tue, 29 Mar 2016 07:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348AbcC2Hb2 (ORCPT ); Tue, 29 Mar 2016 03:31:28 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:33710 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751876AbcC2Hb1 (ORCPT ); Tue, 29 Mar 2016 03:31:27 -0400 Received: by mail-lb0-f177.google.com with SMTP id u8so4726932lbk.0 for ; Tue, 29 Mar 2016 00:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0e03gj3F2y9rasRGlygHDhnfEjJ7k6Mv2ksA0+FmXms=; b=IoFBXTWVxFNpjxx6zvfW0/OsS42zcCy4I05qurPY3XoW3UAaEO5qc3IM398AIrdaXi 2n+2o3qR7EUS8Qz2PC6uEX3S2KoM3KNPS1uoiAjkzldASjC8ds/GfwBtCapIBTUHeQUm CNXoa0n+THy5pzPGkgGZH0sJA0A5f+QJeHdoE= 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=0e03gj3F2y9rasRGlygHDhnfEjJ7k6Mv2ksA0+FmXms=; b=a70lUnAAIXflmUcvidOY9hYdsGNYhID6SJcpFY0l7NL7B2imBPxa0mBGkgIcqbnQ2B 0vipjOhgmnuls6D4jVvndbFE2vJLyLWSsiyD0AtxHB8hU7uF7LSnVtg/v1gpgdbqs96H O65Pu3jHQEh9gdpt3n439FVusvaV5VgWArc8USVwsMYvwBU+HN9slEmcf1lyk8ODFIVm h3FKdVp+p7rMadY6yCN2T1GskKWcmbMSrBy+tn4SdY3rFB4FRlhsGD+e2+jYfPLv97m7 QflXEOqQZeVh8l456Fe12kugbVcOGcT4HSF95+yI+3aGzh7ZrSibfMTvVZu2jPfVQWZ0 83fg== X-Gm-Message-State: AD7BkJLreer/VerBFomSQDkGIUbYdZst91WFg64eUvJnyiK0b9Ln+F5hyATi/6HCyGEOXaHC X-Received: by 10.112.136.201 with SMTP id qc9mr379886lbb.35.1459236685473; Tue, 29 Mar 2016 00:31:25 -0700 (PDT) Received: from localhost.localdomain (c-83-233-167-104.cust.bredband2.com. [83.233.167.104]) by smtp.gmail.com with ESMTPSA id qh4sm5033100lbb.43.2016.03.29.00.31.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Mar 2016 00:31:24 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Chaotian Jing Subject: [PATCH 3/8] mmc: mediatek: Remove redundant runtime PM calls Date: Tue, 29 Mar 2016 09:31:08 +0200 Message-Id: <1459236673-5639-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459236673-5639-1-git-send-email-ulf.hansson@linaro.org> References: <1459236673-5639-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Commit 9250aea76bfc ("mmc: core: Enable runtime PM management of host devices"), made some calls to the runtime PM API from the driver redundant. Especially those which deals with runtime PM reference counting, so let's remove them. Cc: Chaotian Jing Signed-off-by: Ulf Hansson --- drivers/mmc/host/mtk-sd.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index b17f30d..5642f71 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -736,9 +736,6 @@ static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) if (mrq->data) msdc_unprepare_data(host, mrq); mmc_request_done(host->mmc, mrq); - - pm_runtime_mark_last_busy(host->dev); - pm_runtime_put_autosuspend(host->dev); } /* returns true if command is fully handled; returns false otherwise */ @@ -886,8 +883,6 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) WARN_ON(host->mrq); host->mrq = mrq; - pm_runtime_get_sync(host->dev); - if (mrq->data) msdc_prepare_data(host, mrq); @@ -1201,8 +1196,6 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) struct msdc_host *host = mmc_priv(mmc); int ret; - pm_runtime_get_sync(host->dev); - msdc_set_buswidth(host, ios->bus_width); /* Suspend/Resume will do power off/on */ @@ -1214,7 +1207,7 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ios->vdd); if (ret) { dev_err(host->dev, "Failed to set vmmc power!\n"); - goto end; + return; } } break; @@ -1242,10 +1235,6 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (host->mclk != ios->clock || host->timing != ios->timing) msdc_set_mclk(host, ios->timing, ios->clock); - -end: - pm_runtime_mark_last_busy(host->dev); - pm_runtime_put_autosuspend(host->dev); } static u32 test_delay_bit(u32 delay, u32 bit) @@ -1408,19 +1397,15 @@ static int msdc_execute_tuning(struct mmc_host *mmc, u32 opcode) struct msdc_host *host = mmc_priv(mmc); int ret; - pm_runtime_get_sync(host->dev); ret = msdc_tune_response(mmc, opcode); if (ret == -EIO) { dev_err(host->dev, "Tune response fail!\n"); - goto out; + return ret; } ret = msdc_tune_data(mmc, opcode); if (ret == -EIO) dev_err(host->dev, "Tune data fail!\n"); -out: - pm_runtime_mark_last_busy(host->dev); - pm_runtime_put_autosuspend(host->dev); return ret; }