Message ID | c7836cc4430926f8ec8186d6bfca5751d30d3bd0.1620314098.git.mchehab+huawei@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-media-owner@kernel.org> 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 3262EC433B4 for <linux-media@archiver.kernel.org>; Thu, 6 May 2021 15:24:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2FC1610A5 for <linux-media@archiver.kernel.org>; Thu, 6 May 2021 15:24:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235376AbhEFPZE (ORCPT <rfc822;linux-media@archiver.kernel.org>); Thu, 6 May 2021 11:25:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:38112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235213AbhEFPYd (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 6 May 2021 11:24:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C09AC6141A; Thu, 6 May 2021 15:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314610; bh=oAi5YzlfFlQMfzPh3wYGQ2xjGcqBCgu57W3dE0PjRzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFSysAG6gGF4Ca7mSULlQfoJJoiQNc8fRsRRyAoaUjEieiW4nM4jU/nVURp5SeGkY hA3irzWqx/bHvscGSu3yWWS6Sr03eOSUNa+ORpVODqbioRVKwxxCCNKhUHdliRIpSN 0dOhBf8Uvi6j8z6J0sGpyQT5JmKG8SvxPXK8cKTnuX8VX4Bp5osXawVopX/WYo/8SB +VmrDlgOscNbE8JmAzNCV1eEnrxNZSA238+3DcPQ8kPyUp6HgZPsYygZaq5kBTvZGF cM57lLh0s3T+3TjBJgbwXHre0b/T1NmqlSwAabgF5ohja66SVDvIzhhT0iuX7qe87d JRAJQzJkjKp8A== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from <mchehab@kernel.org>) id 1lefqa-000RwE-UI; Thu, 06 May 2021 17:23:28 +0200 From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Ezequiel Garcia <ezequiel@collabora.com>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Sakari Ailus <sakari.ailus@linux.intel.com>, Yang Li <yang.lee@linux.alibaba.com>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v5 26/30] media: i2c: ov8865: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:23:22 +0200 Message-Id: <c7836cc4430926f8ec8186d6bfca5751d30d3bd0.1620314098.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <cover.1620314098.git.mchehab+huawei@kernel.org> References: <cover.1620314098.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab <mchehab@kernel.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Series |
media: i2c: use pm_runtime_resume_and_get() were possible
|
expand
|
diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index 9ecf180635ee..3bf6ee4898a9 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2497,11 +2497,9 @@ static int ov8865_s_stream(struct v4l2_subdev *subdev, int enable) int ret; if (enable) { - ret = pm_runtime_get_sync(sensor->dev); - if (ret < 0) { - pm_runtime_put_noidle(sensor->dev); + ret = pm_runtime_resume_and_get(sensor->dev); + if (ret < 0) return ret; - } } mutex_lock(&sensor->mutex);
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 <mchehab+huawei@kernel.org> --- drivers/media/i2c/ov8865.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)