Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1464886pxy; Thu, 6 May 2021 08:29:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfYtsOEtBKhv6Gemq3DkxLDqZegxeLtyaUEIqIY7odjqEDYUmJvo7C1lTOihrufMAFxJrx X-Received: by 2002:a17:90a:5e4a:: with SMTP id u10mr5180872pji.202.1620314966202; Thu, 06 May 2021 08:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620314966; cv=none; d=google.com; s=arc-20160816; b=VgbGhV1U28jcZKHBMU83GZhtUYhkPu+UmKWcPgrMkg2URlje8gO13TJxhjq0s2pdLx uzgINWJP0eEyyTlbqXmfwIZXmz5UMhgaQA5U+jZVPd91/bAFpeTTA2PQuT97Ey22BqW6 9GqMi+Z5dLLYx5Md0uiYzEhvZl3fkAIegb1UX3qOx/RDpT3JiwD/dgENutagbeVILrnz rT/5ExrfavduRi6w7ruBuok/osjV566gzpSdqfibpmS+q8GQTeMn/UTNLmjjCIwf+nlx kV32h3SALNP7sGRXVwNB2B7fYjD3ppH+DuqkBKa8fPemtM0CkjtjfwfNhfPiyU0xEr5V tV1w== 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=taefQHvjXlBnIRtaZhIxMCEgEIXvMrK/IyRYEjTe++MWRXUzi2jrLOZp7dPCcpbdDI U0/YnCoeejIUy2gGUL+RFsqYsPfq/lKZAcp8o2zk8x8LXFIYs2CJzqvsF/M/UbbzW+Ej aM5dMh1BX1qjg0VvvEEs4dXdGU2oJcDKleiCqz045VhqI9qiJ+Sxf/0FlpTa7Hlz3n1Z QSLPgplJsLCHEh1SBJyyU1nkEMnvBrRFgJ2hTuT+UFYCx4gsPtALV1i2Rt5qaMK5J+5D QWC8186vw+Kf6+wMi2prQ26jmuDqJrbQ6o9jWXasMlcGEy1S4BeXow6dXkEw2dTj/QVq GwwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b="JXEy9i/N"; 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 f18si3724521pgv.566.2021.05.06.08.29.13; Thu, 06 May 2021 08:29: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="JXEy9i/N"; 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 S235557AbhEFP1w (ORCPT + 99 others); Thu, 6 May 2021 11:27:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:40306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235441AbhEFP1V (ORCPT ); Thu, 6 May 2021 11:27:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 888D16191F; 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=rChg/pXG2Qjbehywcb/+z5hE6+LFH66GvNnoCtLFEBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JXEy9i/N7ERG6aoKkMzb4M5TO/fIhlAerMHSRsd02jm3W8bz1QfYSBg6roEahS6sU oKBJSurRGxIOISna8YHYPh0WiaQIhO6EvbOZZSQyGdXRQqlC5Hnm4FgDAxn9Jwxh/b Z6bC3A85niYeQfH3mpYaYLz/53CukSkgBqEz2gHHHiHGf/pTS+6OiZsd8jbRx4c6wR 5l/TQfFfbTJ71wxYl+iAs3uICx+LhHp2futFacCJaSWrCGpOlcoPWVPZUq0bxxdZ59 Kzo+dH8p4BwynSTw8JS4X560xreu6dWaCKzlch2jP/cTjDiVmta87lEowHyUJlzfv7 a3NYVYXsP+hug== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SC7-6d; Thu, 06 May 2021 17:26:06 +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 v5 17/25] media: rkisp1: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:55 +0200 Message-Id: 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