From mboxrd@z Thu Jan 1 00:00:00 1970 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 7ED83C433B4 for ; Thu, 6 May 2021 15:26:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61CAC61406 for ; Thu, 6 May 2021 15:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235238AbhEFP1r (ORCPT ); Thu, 6 May 2021 11:27:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:40278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235349AbhEFP1V (ORCPT ); Thu, 6 May 2021 11:27:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7B75661922; 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=GlCvanyZeZRx9KVkDMbg84X3Nl/epjQxFII8vak4mR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SczDGoVSUqwH5SFEk5OOp94u7cVZf7I+09IWLlfBEG5J4XBhTmgF1CnPo3WNRpBZN IaKyZ+scWvdbl4zjSO9DcL2P8lxI2PSIPsZvShJ0bWSZAJu+kGq8a5CkDmjuQpIbP9 8TWf0dU9zCgk8l1tXdfXfRq2wavnfXytqlL8RNbLqoZCBWYHUc524/5G1070IQq2Xb 9qDa3or5xfH7anhAokS+kPvNFz8yYsQKT0yk1YE9+G0bJuh7lfBaF83GsV24G9Uwmq DNRbdjSVZZl68TYukqJ+TUP3iQ0jj5ViQ/iKiTDfHJQYaoED1I2VV/fga5ioxb3trI 0YU5gyYqfzqiQ== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SCF-92; Thu, 06 May 2021 17:26:06 +0200 From: Mauro Carvalho Chehab 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 v5 19/25] media: s5p-mfc: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:57 +0200 Message-Id: <1f7bfc6a99e3d63217599588452638f364ed096c.1620314616.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. 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++) { -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 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.7 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 2411BC43461 for ; Thu, 6 May 2021 15:28:24 +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 D13E1619C0 for ; Thu, 6 May 2021 15:28:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D13E1619C0 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=phdsKULyzvZ7q2Jv7Ey1hX87L KYNXD6bR7nL3H5H21LbdNtxQ9s4qQphHT7FIlfBUDwmxXHJyZtFVlVKRUmdIiHhTwsHyiK5zuSxK8 eHr0y8Ksq1ziXl4Cz18rQvCfHml0ptTyHC7FjwPH109MJPODgZv7tpTtoNeSOs9yScFm3XAGG4mcc 3ZKPrF0qhK0rS3N2zc1BalnbQQE+6tw1blGnqSuym78hw7lp3F62eFVxA69oajCS8ZmMIkTRjj2ZW wXIX9MOEZkxvg5K+Z+j/0JuQDAR+lA3e7PZIEvmSF4xOf3/7UYPnpriqV9nIUsszC+zA2ypFC6HTS pWG8bF5mw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leftX-004XoO-Cq; Thu, 06 May 2021 15:26:31 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leftU-004Xo2-Hd for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 15:26:28 +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=MyLJyuM3N4nr/N/um7Cz4EDdoO gGB04NfVqobgY9lboo0d3voqxaGq+es5jDWiMv4qRTTPsDb9kruVASV7m4Iz7uQ+BS+7qPcO7npgM YQ+Z+KYz9vLMocaxjiX19UBnjjEp1we/bCIlkpvav0whx+D8f7qf34KsR6xzCCYY8noNqudB19SXh JD/EJ3fcdkp8LLeUqX+F2nf6ldPdLgMtboYrux+tKiCO73Fcz7qvr9AoFLwCaTCI55Opl90BUDCJy pHbQlwYvVC3ENt1X+EUkiniEQPKdIaPmRC4cxAuu03NKNEmEN35Tn2tTRo+oticqvkvTY+/LEOC6B ZPF6gRBA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leftP-0068lh-Tx for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 15:26:27 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7B75661922; 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=GlCvanyZeZRx9KVkDMbg84X3Nl/epjQxFII8vak4mR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SczDGoVSUqwH5SFEk5OOp94u7cVZf7I+09IWLlfBEG5J4XBhTmgF1CnPo3WNRpBZN IaKyZ+scWvdbl4zjSO9DcL2P8lxI2PSIPsZvShJ0bWSZAJu+kGq8a5CkDmjuQpIbP9 8TWf0dU9zCgk8l1tXdfXfRq2wavnfXytqlL8RNbLqoZCBWYHUc524/5G1070IQq2Xb 9qDa3or5xfH7anhAokS+kPvNFz8yYsQKT0yk1YE9+G0bJuh7lfBaF83GsV24G9Uwmq DNRbdjSVZZl68TYukqJ+TUP3iQ0jj5ViQ/iKiTDfHJQYaoED1I2VV/fga5ioxb3trI 0YU5gyYqfzqiQ== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SCF-92; Thu, 06 May 2021 17:26:06 +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 v5 19/25] media: s5p-mfc: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:57 +0200 Message-Id: <1f7bfc6a99e3d63217599588452638f364ed096c.1620314616.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-20210506_082624_048030_A43C90FD X-CRM114-Status: GOOD ( 10.83 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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++) { -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel