From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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,URIBL_BLOCKED,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 906CFC43461 for ; Tue, 27 Apr 2021 10:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 615E66101D for ; Tue, 27 Apr 2021 10:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237515AbhD0KPi (ORCPT ); Tue, 27 Apr 2021 06:15:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:35286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235527AbhD0KOo (ORCPT ); Tue, 27 Apr 2021 06:14:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F0EE613E8; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=Q0bHrDKjUOjsdiFC7y51wKhz9eviTnP6n0iV74l2LA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXmG/9eu8AaxnkVHJjjXtDIKlJy2Dlfm2BCZ2/MihqF58VANihAxMazB4fnaqihqz X5PS80Wq3pMMaXMAlwZt0wQO8ztiSgN/sikXGCmH83OxVC6ut5wXOb/umardTQQ5lL 4KCEUJOQMoxjPrQ5oqkVIo3syrsQvIoyhTc+WxOBDZBWMbqzOBexhvCxks9AYXCEYb 7CE8fV44YeJ6H9SSnnBssSKFigYLchpbx5MiZCeGQ33AvGQdnBxyliUSbrQ78PU4qL WGEKSA7MMhfbHOEWYY59d0v389ilVdlF+4NhMRtgTPZfkpUJp7Ld0wHxJCMNV9fX/O v6WQQ4Sza9eDw== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6W-5a; Tue, 27 Apr 2021 12:13:50 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Paul J. Murphy" , Daniele Alessandrelli , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 40/79] media: i2c: imx334: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:07 +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-media@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. Reviewed-by: Daniele Alessandrelli Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/imx334.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c index 047aa7658d21..a5a03bb4a6ae 100644 --- a/drivers/media/i2c/imx334.c +++ b/drivers/media/i2c/imx334.c @@ -717,9 +717,9 @@ static int imx334_set_stream(struct v4l2_subdev *sd, int enable) } if (enable) { - ret = pm_runtime_get_sync(imx334->dev); + ret = pm_runtime_resume_and_get(imx334->dev); if (ret) - goto error_power_off; + goto error_unlock; ret = imx334_start_streaming(imx334); if (ret) @@ -737,6 +737,7 @@ static int imx334_set_stream(struct v4l2_subdev *sd, int enable) error_power_off: pm_runtime_put(imx334->dev); +error_unlock: mutex_unlock(&imx334->mutex); return ret; -- 2.30.2