From patchwork Thu May 6 15:25:54 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: 12242293 X-Patchwork-Delegate: kieran@bingham.xyz 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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 8E150C433ED for ; Thu, 6 May 2021 15:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 639FF610E7 for ; Thu, 6 May 2021 15:26:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235447AbhEFP1n (ORCPT ); Thu, 6 May 2021 11:27:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:40264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235389AbhEFP1V (ORCPT ); Thu, 6 May 2021 11:27:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 762A96186A; Thu, 6 May 2021 15:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314783; bh=sxC12P0hnHwRHaQLQ482WLbW7rqubC4RWbxVsfXWuSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eHTLUPtDDE2mD+6hY1J/wgIMGtSZIi5NYxe3bb8HK/RXzClD1ouknwGUcCZpbHAg5 RIgwlXQTNYJ+7I6DKozm52oAqRyvcOKaoEMSOatXYnSZk5ZHHacP5KencyNmyZxT/c O1EPuNvNKJMNs3vb3lnh8NoKQPGj1W64rxdHoWAspWI7tBoPOlzPirJ0aoDq//e5Fh s9xGCIdvLPHCiWhHy3idxxSU8WFWlk89IHM7p6rlQ00FlMmKs0P7eIWo3Hel1fFfjh I3dHlMFdg8yBUxn6arWCOgR6Gqsmb7GSQaxeMKNnK9ffd4P+sJQipXLRiWJjzeJ/rr 3XVYbfqUlDZiw== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SC3-5e; Thu, 06 May 2021 17:26:06 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Laurent Pinchart , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v5 16/25] media: rcar-fcp: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:54 +0200 Message-Id: <256365d690c780e9e89cba369ebaac805f0ec256.1620314616.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@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. As a bonus, pm_runtime_resume_and_get() always return 0 on success. So, the code can be simplified. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Laurent Pinchart --- drivers/media/platform/rcar-fcp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c index 5c03318ae07b..a3a7afc03d7b 100644 --- a/drivers/media/platform/rcar-fcp.c +++ b/drivers/media/platform/rcar-fcp.c @@ -101,13 +101,7 @@ int rcar_fcp_enable(struct rcar_fcp_device *fcp) if (!fcp) return 0; - ret = pm_runtime_get_sync(fcp->dev); - if (ret < 0) { - pm_runtime_put_noidle(fcp->dev); - return ret; - } - - return 0; + return pm_runtime_resume_and_get(fcp->dev); } EXPORT_SYMBOL_GPL(rcar_fcp_enable);