From nobody Sat May 10 03:27:42 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619247318; cv=none; d=zohomail.com; s=zohoarc; b=X3UrmXKkaQqSWLJ7WUaclF1h9lKs0y+z1ytU6RqkdJ9W765wmlEQuz6C1tc1z3mLEYYP8Bs+nafP3M2RPQbRC6fg9sYzY3VHTB2MAj/bqG9dSx8FLtkXqhJbVw14NptD2IlwnG82lXBJiLjWMCPu83J259otgTAycI2DUXyhPJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619247318; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hvme1ECKRdxAe6lX/uoxkKGc9vU0bHq9EE8U6DzypV0=; b=eul/nJnWibRzVzgXo6GZ6f46ePq4OAe2PT3BPom3ZLwfXqPgZSEFRPp544Xbsl1vi88EvnL2OLKXXE7e9rTeUrnuKoB7e13PiDaBNSnzh/Y9TLiuo+SfqT/3o7G3DRFrzPhJos94zytzCRs4ZqcTpCByQstFEqakzbDEaIBAS5w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 16192473181982.727093899265128; Fri, 23 Apr 2021 23:55:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232742AbhDXGyB (ORCPT ); Sat, 24 Apr 2021 02:54:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:35848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237056AbhDXGqg (ORCPT ); Sat, 24 Apr 2021 02:46:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C60556193B; Sat, 24 Apr 2021 06:45:33 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1laC2m-004Jgr-PS; Sat, 24 Apr 2021 08:45:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619246734; bh=2uz7aSLoagaiwsviWYHDbC8DuUarXl/FOpoWTSwsrxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfBrwrmBfYoeC9NADSynMCkyG98jkY98bdc7U4ZsBiJMBL/l3I7AXj05SG+lFaNeb N3HHg0UA3MzNjy9NihDfITuIcllJEQSuexWw4M/GzulVt9kDVxgfg+2IBOKoA9MZeZ 0WSFQ6zYWjracMUCPYZi3RyH5VCmOnIW7vVMouweoXMITHFt/F/PHN4gvkgshbn4NO Pdmcdzyzy3rtCajmb6GxA+v2QdqHudW2YjLbNtJfLiAZsOwhTHomK2MulB9fX2GV1P SHVp5OB6/ZIHXs5xi1tEOLduoMl1u8Un5b+D8AZwvQ9CEbjaOYhk/wqMxUdufAevKz 8XSCGkTXL5Hdg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 65/78] media: pm_helpers: use pm_runtime_resume_and_get() Date: Sat, 24 Apr 2021 08:45:15 +0200 Message-Id: <32f56f8ad0a25a075be28e129eac02bd2424b5ec.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: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th 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/qcom/venus/pm_helpers.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media= /platform/qcom/venus/pm_helpers.c index c7e1ebec47ee..9e32ec866af7 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -486,7 +486,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) int ret; =20 if (coreid_mask & VIDC_CORE_ID_1) { - ret =3D pm_runtime_get_sync(core->pmdomains[1]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[1]); if (ret < 0) return ret; =20 @@ -504,7 +504,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) } =20 if (coreid_mask & VIDC_CORE_ID_2) { - ret =3D pm_runtime_get_sync(core->pmdomains[2]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[2]); if (ret < 0) return ret; =20 @@ -990,11 +990,9 @@ static int core_power_v4(struct venus_core *core, int = on) =20 if (on =3D=3D POWER_ON) { if (pmctrl) { - ret =3D pm_runtime_get_sync(pmctrl); - if (ret < 0) { - pm_runtime_put_noidle(pmctrl); + ret =3D pm_runtime_resume_and_get(pmctrl); + if (ret < 0) return ret; - } } =20 ret =3D core_resets_reset(core); --=20 2.30.2