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,USER_AGENT_GIT autolearn=unavailable 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 9D691C433B4 for ; Sat, 24 Apr 2021 06:51:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A0A861581 for ; Sat, 24 Apr 2021 06:51:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244448AbhDXGwS (ORCPT ); Sat, 24 Apr 2021 02:52:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:35760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234473AbhDXGq1 (ORCPT ); Sat, 24 Apr 2021 02:46:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D46B961943; Sat, 24 Apr 2021 06:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619246734; bh=UPiG7WjyXSC7rjSk7XmxEwGay8JCnhR2MqRqUi6k0z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ptCG4hLUA7WpUVdM3fjbS9LgdHDMYl+UBbr8i/SGdbyQ3V5CP7xWc+6sBzit0enAe ZN6fU5dW7dhZ/7DPsIds2VIuU0RHIvjXixgzb4t1Rq9hKYF+T2Vhx0cn3I58b56Agk PsfZj/kiuHQt6/FW8vaIMrtSKh01Lid770t0jCTT0b78It/lTbazJtWxExAqm6D6P6 5N/D+JlQhvgQEVWDcGjwufa7ykIwPmS24kV/EYbwg6iOAYbrjFJrxm2VXO/pcdfjwO WtgOLn+4JrME+7cgreOnj/hGcPZAjgKpJM3dc75eejotRd+3KrGY0ghp3N18yFBcH+ DdyEcF2qOnyQA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1laC2l-004JfS-Tv; Sat, 24 Apr 2021 08:45:31 +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 36/78] media: i2c: imx334: use pm_runtime_resume_and_get() Date: Sat, 24 Apr 2021 08:44:46 +0200 Message-Id: <07cca2da63bfe905e3c4dc9c51945ead79c63572.1619191723.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/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