diff mbox series

[24/30] ccs: Clean up runtime PM usage

Message ID	20201124093226.23737-25-sakari.ailus@linux.intel.com
State	Superseded
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, mchehab@kernel.org Subject: [PATCH 24/30] ccs: Clean up runtime PM usage Date: Tue, 24 Nov 2020 11:32:20 +0200 Message-Id: <20201124093226.23737-25-sakari.ailus@linux.intel.com> In-Reply-To: <20201124093226.23737-1-sakari.ailus@linux.intel.com> References: <20201124093226.23737-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Trivial MIPI CCS support \| expand [00/30] Trivial MIPI CCS support [01/30] ccs: Add MIPI CCS compatible strings [02/30] ccs: Add device compatible identifiers for telling SMIA and CCS apart [03/30] ccs: Add CCS ACPI device ID [04/30] ccs: Remove the I²C ID table [05/30] ccs: Remove remaining support for platform data [06/30] ccs: Make hwcfg part of the device specific struct [07/30] ccs: Fix obtaining bus information from firmware [08/30] ccs: Add CCS static data parser library [09/30] ccs: Combine revision number major and minor into one [10/30] ccs: Read CCS static data from firmware binaries [11/30] ccs: Stop reading arrays after the first zero [12/30] ccs: The functions to get compose or crop rectangle never return NULL [13/30] ccs: Replace somewhat harsh internal checks based on BUG with WARN_ON [14/30] ccs: Refactor register reading a little [15/30] ccs: Make real to integer number conversion optional [16/30] ccs: Move limit value real to integer conversion from read to access time [17/30] ccs: Read ireal numbers correctly [18/30] smiapp-pll: Rename as ccs-pll [19/30] ccs-pll: Fix MODULE_LICENSE [20/30] ccs: Change my e-mail address [21/30] ccs: Allow range in between I²C retries [22/30] ccs: Add support for manufacturer regs from sensor and module files [23/30] ccs: Use static data read-only registers [24/30] ccs: Clean up runtime PM usage [25/30] ccs: Wrap long lines, unwrap short ones [26/30] ccs: Use longer pre-I²C sleep for CCS compliant devices [27/30] ccs: Remove unnecessary delays from power-up sequence [28/30] dt-bindings: mipi,ccs: Don't mention vana voltage [29/30] dt-bindings: mipi,ccs: Add vcore and vio supplies [30/30] ccs: Use all regulators

Commit Message

Sakari Ailus Nov. 24, 2020, 9:32 a.m. UTC

If pm_runtime_get_sync() fails, there's no need to set the device active
again. Also, in the same case to return the usage_count to zero,
pm_runtime_put_noidle() is enough.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/ccs/ccs-core.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 5e01f22608d7..c3023570a620 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -1625,8 +1625,6 @@  static int ccs_pm_get_init(struct ccs_sensor *sensor)
 
 	rval = pm_runtime_get_sync(&client->dev);
 	if (rval < 0) {
-		if (rval != -EBUSY && rval != -EAGAIN)
-			pm_runtime_set_active(&client->dev);
 		pm_runtime_put_noidle(&client->dev);
 
 		return rval;
@@ -2842,9 +2840,8 @@  static int __maybe_unused ccs_suspend(struct device *dev)
 
 	rval = pm_runtime_get_sync(dev);
 	if (rval < 0) {
-		if (rval != -EBUSY && rval != -EAGAIN)
-			pm_runtime_set_active(&client->dev);
-		pm_runtime_put(dev);
+		pm_runtime_put_noidle(dev);
+
 		return -EAGAIN;
 	}