From patchwork Mon Jul 19 14:51:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 480025 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4284299jao; Mon, 19 Jul 2021 09:27:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBfXGyFH5o+npfGKLmVdDM0X5RND99VmLZ6+VtLn5IlQweWLRRvP61Mg59D7HYF7W2lH1E X-Received: by 2002:a05:6402:20e:: with SMTP id t14mr34796872edv.193.1626712030833; Mon, 19 Jul 2021 09:27:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626712030; cv=none; d=google.com; s=arc-20160816; b=q6DpAj4ldIPgys/neCA0N9Bn2cGphtnP79iLu9m+r/nir3Se38cgqDs52XD2Cikruc M4DO2+Zcysd4Upv+Cp3hJ19W5/0HOY3abqP+kAvSd4RGq4sFBBQXJMAYkR6xOU0gb/Tw 071in/lCmoKRlTpOlAAv0MIbqphynbfehaIwOYfERMe7/INYfcUEsap+6Z//CG2CQ9gn kZ1Cyf9uBwbfe5XJ3CVQTQAAWwhDJQFKEB79/tCDVEcKl1Vt+2US8axgILhPh5UUaNGR 1wMVriOEITCs5oZPL6cG+EITriNT9u/7CI/nX9SAwOc6LhlW26su67zV1jFkuCQEpyIo KOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GZ+jIpjNxhgb8IW55+3bgSknVfmOcM2aMKl3Uk54dtA=; b=hKbY7h4NLXctwSqUNy0PzBVaVfUXY6TfZatXkXTPdh6at4dWUvyhfQUW4VVg3shN+K VA7kj/2p5eOrT/i+Hx733Z77Kc6klDBBCw0xS8APBlYnzeF9Ud9XObhQagnioyM/jShG 3XCdlUMLfezlQ23AmdzZUDFkFZDxrQrjO9wd8+6hpfuYywEsLO4wgcshDUA3Q62VztZ5 yklIpDGYsvkXkEgjEzUiLwYWbZL14oUY/lsweLr6+1m+YI0z/pYRtYb1W7TczZfQsrNP KMM2lhd83wp4cJ6v/LccmJ1gwKjZWLEWUGQm/y40S5Jc6+ooXYVfwpDoSnD28W0Tsw/d hjlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lhk6DndT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id la14si22045543ejc.142.2021.07.19.09.27.10; Mon, 19 Jul 2021 09:27:10 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lhk6DndT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348522AbhGSPoI (ORCPT + 12 others); Mon, 19 Jul 2021 11:44:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:34260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233689AbhGSPkm (ORCPT ); Mon, 19 Jul 2021 11:40:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4F03161363; Mon, 19 Jul 2021 16:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626711652; bh=cyHD2oQuOJvUpiuoQ4Y/gRXIIVB8xWrQuC8BwU950Ks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhk6DndT0uRfe1vWTJmxdmcrFF2qJsY5131IUakDt34T8uOImU863s74dM1GSM/n9 +9nGThQJaeR84Li541rSbY1QIBJYMu0oINWH5wugQ5eOK8h/fkNxMVFa4+tBKOYaze WnCnAfPJ1DpN1Dx2qfvqATi4fle137M6X22rt2MA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Rui Miguel Silva , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.12 048/292] iio: gyro: fxa21002c: Balance runtime pm + use pm_runtime_resume_and_get(). Date: Mon, 19 Jul 2021 16:51:50 +0200 Message-Id: <20210719144944.090229374@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.514164272@linuxfoundation.org> References: <20210719144942.514164272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit 41120ebbb1eb5e9dec93320e259d5b2c93226073 ] In both the probe() error path and remove() pm_runtime_put_noidle() is called which will decrement the runtime pm reference count. However, there is no matching function to have raised the reference count. Not this isn't a fix as the runtime pm core will stop the reference count going negative anyway. An alternative would have been to raise the count in these paths, but it is not clear why that would be necessary. Whilst we are here replace some boilerplate with pm_runtime_resume_and_get() Found using coccicheck script under review at: https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ Signed-off-by: Jonathan Cameron Reviewed-by: Rui Miguel Silva Reviewed-by: Mauro Carvalho Chehab Link: https://lore.kernel.org/r/20210509113354.660190-2-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/gyro/fxas21002c_core.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.30.2 diff --git a/drivers/iio/gyro/fxas21002c_core.c b/drivers/iio/gyro/fxas21002c_core.c index b7523357d8eb..ec6bd15bd2d4 100644 --- a/drivers/iio/gyro/fxas21002c_core.c +++ b/drivers/iio/gyro/fxas21002c_core.c @@ -366,14 +366,7 @@ out_unlock: static int fxas21002c_pm_get(struct fxas21002c_data *data) { - struct device *dev = regmap_get_device(data->regmap); - int ret; - - ret = pm_runtime_get_sync(dev); - if (ret < 0) - pm_runtime_put_noidle(dev); - - return ret; + return pm_runtime_resume_and_get(regmap_get_device(data->regmap)); } static int fxas21002c_pm_put(struct fxas21002c_data *data) @@ -1005,7 +998,6 @@ int fxas21002c_core_probe(struct device *dev, struct regmap *regmap, int irq, pm_disable: pm_runtime_disable(dev); pm_runtime_set_suspended(dev); - pm_runtime_put_noidle(dev); return ret; } @@ -1019,7 +1011,6 @@ void fxas21002c_core_remove(struct device *dev) pm_runtime_disable(dev); pm_runtime_set_suspended(dev); - pm_runtime_put_noidle(dev); } EXPORT_SYMBOL_GPL(fxas21002c_core_remove);