Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp621550pxy; Wed, 28 Apr 2021 10:38:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztAv/9AEPg/boMwcVY5qejnpqRUXevhMAbILH8SJ1Ssomd0X5drOA4qgUqt8uKQlmM17GH X-Received: by 2002:a17:906:5952:: with SMTP id g18mr11008733ejr.313.1619631386618; Wed, 28 Apr 2021 10:36:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619631386; cv=none; d=google.com; s=arc-20160816; b=lRYevEjZLaTwlqdsJuJ2QIPgjBQwU81vECXYPF3S+xBBPiNn36y1fPEjx1fawJFBvh gzi51zlH3PW87Tk5TaU+K+7fKhM5PFZaBGKzny+mAndNQ8h2uDcX8gUgFxUA3WqlgKqx UglRWuxWZcItD9r0X+ci6YWKzkRjLVZ3w4ODoGuFO9OUnOOu0sIb5wWjUTiS0+4Zd0MM OUJoKW1poD6R6NaZXKi5CR5bIbnSXMa5JcQ5qokVFS68Pridh2Tg9EY+MsQzD+wB10cJ IK2z0s71z100GYW9F/tefQf4ZByDdtQSH3UEnrsq2Zlqv+6V1vnn1No6V82hisoJ1gID dN/g== 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=wNlWAJheWo8r305lpFRr+Xmq5CAdeEepltQZlmQJw8g=; b=lGJ8oB/ZKOQ12zG1tIkiUm1hMWgvoptNirGRuUiWkkYXXTHqO5EsJsX/1EZ7XNpfvi i54pEvZ08j7DoWbhx7OlGCB+4DzSvYdxxnGhHZenuE1pwT8amULJW+bXlndc2lbFhxbz oCkaN/ETwbrSn1zkXFhmjRpNzTHtvs803r0KJj0kSCxjedsjEmg9NNtlXcEtdCqx5ZQ4 tH3p++CUwrRJXuh0Bl8T1ZH4TNrziW1E0Z0mMmzAzq6kLEun1L79Q07KEoeEaB/gVYEq xYFlYJCtqQE0ZcWphgSX2jk+wWunbgNM8p6K64wZ6wNIN5EXOf1GErOx7lihQkRs4dd8 89rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b="uR/Jo/Dp"; 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 y24si341655edt.176.2021.04.28.10.36.01; Wed, 28 Apr 2021 10:36:26 -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="uR/Jo/Dp"; 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 S240037AbhD1O6K (ORCPT + 99 others); Wed, 28 Apr 2021 10:58:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:36802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240420AbhD1Oxy (ORCPT ); Wed, 28 Apr 2021 10:53:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EA6261446; Wed, 28 Apr 2021 14:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619621564; bh=rChg/pXG2Qjbehywcb/+z5hE6+LFH66GvNnoCtLFEBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uR/Jo/DpIUEje6LsKdX3PHv/mdjGFVxuHtrPXdPDc+v8dwpOtdxjmkNhhhzSopQsy VSkDo3DDGGZ2gtoDSbH92D4GKyCo3bTAt54F6gwW3uSpbPqD9Gz14OGnvKF8hiFgzi +MPre5UkHMPOVzTKyzgZXb85GXnCgL08yh6RNscnu9ytsbLzB2uBphS5ULdc+tW04Z yFJ4DRfB1ZpjpPDUXuWEzqBguPdtassPM+2xc5DFzDiLTWffXpvG7M1IzaLXvjFw2l Cy1w59xd4cNTLjg7y6LVbd7mTAojeXRxkjAXfQUPnEjSNxAP7tPDvkZIBibmK8RG53 ORqbbPx4cSctQ== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lblYR-001Dsy-K9; Wed, 28 Apr 2021 16:52:43 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dafna Hirschfeld , Heiko Stuebner , Helen Koike , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v4 70/79] media: rkisp1: use pm_runtime_resume_and_get() Date: Wed, 28 Apr 2021 16:52:31 +0200 Message-Id: <17d3cf0b3b137011353079109a4918592c4f57fd.1619621413.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/rockchip/rkisp1/rkisp1-capture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c index 5f6c9d1623e4..3730376897d9 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c @@ -1003,9 +1003,8 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count) if (ret) goto err_pipeline_stop; - ret = pm_runtime_get_sync(cap->rkisp1->dev); + ret = pm_runtime_resume_and_get(cap->rkisp1->dev); if (ret < 0) { - pm_runtime_put_noidle(cap->rkisp1->dev); dev_err(cap->rkisp1->dev, "power up failed %d\n", ret); goto err_destroy_dummy; } -- 2.30.2