From patchwork Tue Apr 27 10:27:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12226283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99B0BC433ED for ; Tue, 27 Apr 2021 10:36:18 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 420B661168 for ; Tue, 27 Apr 2021 10:36:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 420B661168 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=F0d9XC9KP6FhjMoM0wM7L0CwHLPXq5crMgQIDj0aVXc=; b=Lcsku0u6ZQUbaHFI1/Ng2wIBS 1KJtQN/0ATRVgAew6R+dfq4ru32K3KX4mxM4+N3+recIN405tSBldab9zkrBkkdu4Wm2CqXtnOpHk DZMp3nKkRzxyjV+18ZqR8XByx5oNgAfDZo3SsLp1nGqG+xEAwENkQ8nfw53EqO3rHmN6LZSWZUdOP G0JkkxvIqyhns84OV6zc0XFGDGsxgodOlXnJZUNCDXNtqnrLY4qKeNk6dgLPPbtHQ30IXfh3SUSrL Tsa5BpzA2cjp/WRvJDQQXxVatFD/7s8kAjDOzam9fpxzmupVvqRfsTwwj+afWGgYyf2XyR3XZ6WKr kUcnFAf2A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbL1u-001OpP-1o; Tue, 27 Apr 2021 10:33:22 +0000 Received: from bombadil.infradead.org ([198.137.202.133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKwE-001Mz2-IL for linux-arm-kernel@desiato.infradead.org; Tue, 27 Apr 2021 10:27:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=UuREguUnWtJMEbW22CUBV5mbM3OEKqZjCmRLeRWME90=; b=2SDMWJKvKJGj37rk+/6xA3pXuh gPiTUVPOsPsVM+kl5t35aU8qVh7m2DCcQ1lN/qDBw/4OJspxO3DJ9lrUhFiRpiuTkODwUBaNEt9Er n3ZnBVUQEzy+NtWwLu/C3uI1mOwh4FDWoai2rNaPf+m+u22nabNFtJzkcK+LbPSFBGUCqKAZ8qGaV UfN2MlrN2deMjpFDO6znVAOATfMIo3BhHwN1PhitkljULCICTZoQvhrFICPZkVWq9sS5v2d3g2bF5 fZ6otgNTB1rPFMRVqXTJmkLDK+QB1q2fJORgzjMPFvEOopKcpVLbniYwXPmPnJgMN+39X7qAJ3+/6 MvaEqu6Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKw8-00GdBG-7B for linux-arm-kernel@lists.infradead.org; Tue, 27 Apr 2021 10:27:28 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8752D61419; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=GlCvanyZeZRx9KVkDMbg84X3Nl/epjQxFII8vak4mR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRuN6RmqcFQodREOCRy+jAcix/qZjUy416To91BdxH5zMoHBcQmajEmfcEo6zn/MV phXYNvAGOksmNSCVaFYle9I0HA7uZN26uSislFBXRhQwtl22fl/PNT5MnL/c6IDOvg DRYKld857KFGysrlb5dBhBZyQ8hsFcWZwmVxc5nE2iJddSdgjGfbxAI4kQGVFQLr6H klaPwaqqIHm5czFctc9hMQrrfr+QmZDLzmg/2PyNR9x0qsFnEBoQuEwWsygAqTmciH CrkkScMkh9ds1nVM6h72+WHtIEv0DEs8v+ub9VB9d2+s7kRdWLtOIbqNaUwQtdvY0l C8xePLL40BXPA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2h-Cy; Tue, 27 Apr 2021 12:27:15 +0200 From: Mauro Carvalho Chehab To: Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrzej Hajda , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v3 72/79] media: s5p-mfc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:02 +0200 Message-Id: <828322e0f8b06ef2962b64a6f6f1b368eaecf7a0.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210427_032724_314582_72BB7861 X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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. Reviewed-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 62d2320a7218..88b7d33c9197 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -78,11 +78,9 @@ int s5p_mfc_power_on(void) { int i, ret = 0; - ret = pm_runtime_get_sync(pm->device); - if (ret < 0) { - pm_runtime_put_noidle(pm->device); + ret = pm_runtime_resume_and_get(pm->device); + if (ret < 0) return ret; - } /* clock control */ for (i = 0; i < pm->num_clocks; i++) {