Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp621374pxy; Wed, 28 Apr 2021 10:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxE//yVF1zKyPp4IpfQQUDpeIcYJ1XqREZVfddZfqYE7sHmQ3KT271zdAKWRy8aSrmNSrFk X-Received: by 2002:a17:906:328c:: with SMTP id 12mr13967730ejw.361.1619631386628; 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=sHd6L7iw9vwTiQJyXTNRUn2P4O0degxits50sKU+oLK0CKtgTbn/WBW9z5drBun2Qg VBn11GSKZc3TRsmbUYIqNR0zvCDce94bmCw8egoFrjKHInG69mTkhbZD7xZcdcBfX/K8 vRN7J7egG/nEfguEeT+MLe/bTv/8g3zECuEtCnY2ItN4fSecE1MSVxFIxBAZSyTrgHxg 6xfTr6a5QHS8sp7v8L6D+Vlhemb1mrTEC3k4RAOQ+8VeuF+intDXmqDLyb1LWOZ20Bs/ 8q9tN7yp3wXb6uPeBEBGVyiDLmZ3pgcx4m1tatku4z2TqkS6edbh94WDMVh7KnjKnVeb xH8Q== 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=MemQBCMDmE92SA4Dh34kjM0Xf+mWVXaAaIa5OPfJXiE=; b=k+eGY+M7MRtduE5YmU+eavCdZ3vo46Ifc8lXgK6xdORFS0UTy0uSKalpOkiBF67gHE IIrZWh5+F2mK5i+zq9TxD96aK6TkhUYowc4ydRBQ8WuZZrQQIb0wBEeVoa+ikczQrGq9 Ze4UCtEeou8g7WVHpWB+uQTqAKqvqYuV7C0X8grOx/lzfQCAbtOS8gqnw+i/gZbeqfWh KMvngX/NVX78RnjElhnPnbFxjjfACGytwP2VJFTXmCuOXgPlVEoLCh7Nr9Ot2vc5QEuG qnuV1UgatcGfX2oRgk6wSkLetglgXXoX/INGq5R0x2HU16Z4choLPUQqFc5cCKy3Zhgl Vukg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=GgvfXq0F; 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 c11si341973edy.178.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=GgvfXq0F; 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 S230057AbhD1O6N (ORCPT + 99 others); Wed, 28 Apr 2021 10:58:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:36354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240448AbhD1Ox5 (ORCPT ); Wed, 28 Apr 2021 10:53:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB92561947; 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=1619621565; bh=nHZL/8LfEY59F+jSTZXbI5IsJhAvjS0xN6pbKcv/Zf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GgvfXq0FPd0nXZ7nGPgs1dqOiQ5HDmrlQ3nw52kie/TcOI1RyT8vHcg4FhzShaNO+ BU/PtqBrI/OlsI0y0FJLbhDiRzdtPlISP3cG02Rva5bwburZu+3gkOQQBVuzJKB3R0 hhK6YopNNYvuvw4Q+WOm/4sm6uvkE9L8eQOciE86CAqdaInBw8MX+umPHmQ49N9JH2 8ZN/Sa4AOQJ2KbqN6RwjlbHEFd1HorZDEjL6C+n/nxSHlYk7gpChyLf9APwSodpyFq tMO0Mn7rn0qxGf3pb2hh4mMum6qk7xdsue8Kiw2r3JtYO9qzvOq4UtKmOFq/iwB7Tt 7+3lzmfDtxXkA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lblYR-001DsF-5S; Wed, 28 Apr 2021 16:52:43 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Gustavo A. R. Silva" , Chuhong Yuan , Hans Verkuil , Jacopo Mondi , Krzysztof Kozlowski , Marco Felsch , Mauro Carvalho Chehab , Sakari Ailus , Zhang Xiaoxu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v4 55/79] media: i2c: tvp5150: use pm_runtime_resume_and_get() Date: Wed, 28 Apr 2021 16:52:16 +0200 Message-Id: <4b1b8a0a5867461c391e113eeedaacfd09a8f5d5.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/i2c/tvp5150.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index e26e3f544054..374a9da75e4d 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -1448,11 +1448,9 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable) TVP5150_MISC_CTL_CLOCK_OE; if (enable) { - ret = pm_runtime_get_sync(sd->dev); - if (ret < 0) { - pm_runtime_put_noidle(sd->dev); + ret = pm_runtime_resume_and_get(sd->dev); + if (ret < 0) return ret; - } tvp5150_enable(sd); @@ -1675,15 +1673,7 @@ static int tvp5150_registered(struct v4l2_subdev *sd) static int tvp5150_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int ret; - - ret = pm_runtime_get_sync(sd->dev); - if (ret < 0) { - pm_runtime_put_noidle(sd->dev); - return ret; - } - - return 0; + return pm_runtime_resume_and_get(sd->dev); } static int tvp5150_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -- 2.30.2