Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp1943848pxy; Fri, 23 Apr 2021 23:52:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm6+MMtL1ns3ldVlBdZ/5iAyVjhSQpgPAXIAm1M5kw5pIwkdlH3Ha8kFWrFKNYD3xC2NXz X-Received: by 2002:a17:906:4342:: with SMTP id z2mr7745502ejm.337.1619247125275; Fri, 23 Apr 2021 23:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619247125; cv=none; d=google.com; s=arc-20160816; b=B5fjsxWe1aGj/JfsFopLplMxV9r7P9c0MqqQTuMQ2B27koG1f7CZfu/TkiJyjN8TT3 jPic0X2jXeLuYiaOhhGh9V7MQiMG1GNSwXlysQnK+pide0mMcpiceT15pZbPy22LO4FE hpWYJnJtespBStjhPeXr48JnJf9uFtK+kIK8AaqwMMJxvWZcXcVuZYmOG+kL6mHKyNpz Ydo6Mth+TThQbDno78sKPEaEkd9s61leJ/1RlkHFKvwCHjALNQGxUVnPvj5r8bkjir+Q XyENoPDe0aXwpCfSWkwEF+arvEFnFFZanWOvbrpDDQd+fg3Lu6A+ZFOTDX9ymC2s0lti 1HVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=WEoKSli4CVZz+4bD9y2dk4c7P3DpoTs6YwkxOMxzuPM=; b=vIfEuY+SVDkZLmyN73gb1xv/jqYWe0n9A6xYcFO5ufB1FeeicPsqp/UPrpn5xJAa2W 9lOxFWZfHZqAJR/s2h5pUu0QGSiP/y5q2xBoLc8zaWZCxBJpFwPhC+lbgcZXKPSiMiU7 AI24x3mueSa/Qsak51dte664C+K/yHi0YcKbMy58o0hI3saKbTuYz/h3gyXYe4arLHDr ubdKHNkD2IHa2CGdEMDev2F+Q/2mUIt9KS/z5p1XRAJ9uYbn9MjVql/TOpA1yT3jJurM 3YtVHPfAH2/CLX8RsrpmhtlEjEGDYbhTuykihJX4761DgueDL7iuprWHFMMG2ZWLTlAz Covw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=or0k9a+J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s13si7748609edr.443.2021.04.23.23.51.41; Fri, 23 Apr 2021 23:52:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=or0k9a+J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244197AbhDXGtc (ORCPT + 99 others); Sat, 24 Apr 2021 02:49:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbhDXGqP (ORCPT ); Sat, 24 Apr 2021 02:46:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 617BF61629; Sat, 24 Apr 2021 06:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619246733; bh=RRNI/XcWNU/RuS+rdQ4ZLEgZbvA4GIVDsHd+QWsqIF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=or0k9a+J3ADO8YB/0DbxauzYDJZNi/nOzh9IW/q3WdpTEYIt55ZpVzqtWOWdKflrR ZRO/qkj4HHU6ijkhCPWH/g2HsF8iLnxsQAkljinBGBzMqcy2I9WU7RywaZn7csL6gP Dw/ZcPCL8yLN1YmrsYY49RLwdMbQf8hAxAFfoZfqFg4zVDYPxP2PRzagCORNEynRjh 9E5HDkNjHaWZ1nx6O1+7A3pCoKZvlt2m6XAPgS9qyk0bh0XtYOkr0ahCuWyrUZeKJ1 ebUae87vtPECEN2fnmUNQZBEGcvCBG236hOzpMPPxanaF3UTzPyxdyk57ThMNr4K5v hMhEHmW0ZRyPA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1laC2m-004JgW-Il; Sat, 24 Apr 2021 08:45:32 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Hans Verkuil , Krzysztof Kozlowski , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 58/78] media: exynos-gsc: use pm_runtime_resume_and_get() Date: Sat, 24 Apr 2021 08:45:08 +0200 Message-Id: <9c7d683907b9f9cf4a99f57f978671ec7f5a1dbc.1619191723.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/exynos-gsc/gsc-core.c | 3 +-- drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index 9f41c2e7097a..9d5841194f6b 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1210,7 +1210,7 @@ static int gsc_remove(struct platform_device *pdev) struct gsc_dev *gsc = platform_get_drvdata(pdev); int i; - pm_runtime_get_sync(&pdev->dev); + pm_runtime_resume_and_get(&pdev->dev); gsc_unregister_m2m_device(gsc); v4l2_device_unregister(&gsc->v4l2_dev); @@ -1219,7 +1219,6 @@ static int gsc_remove(struct platform_device *pdev) for (i = 0; i < gsc->num_clocks; i++) clk_disable_unprepare(gsc->clock[i]); - pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c index 27a3c92c73bc..09551e96ac15 100644 --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c @@ -58,7 +58,7 @@ static int gsc_m2m_start_streaming(struct vb2_queue *q, unsigned int count) struct gsc_ctx *ctx = q->drv_priv; int ret; - ret = pm_runtime_get_sync(&ctx->gsc_dev->pdev->dev); + ret = pm_runtime_resume_and_get(&ctx->gsc_dev->pdev->dev); return ret > 0 ? 0 : ret; } -- 2.30.2