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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 82A6EC2D0C5 for ; Tue, 10 Dec 2019 21:17:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B02220838 for ; Tue, 10 Dec 2019 21:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012667; bh=uGc5dOvIk4aVUvA8p0bFiGv122bgR82WQjrjtSSwxsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lo/ffadSDpWFSntEyrwk7GUm+vUzE9OlTEckDC6Nihy0Uwtufc0TYLwbkQY03+a3g ojhb8qeNnPeopnHzo5GXoSrUZ+wTHfIwHop6soFQUGgzZiAtn0AVd72UoggADea4ys xttdPCzuiaXqDanDNUOwDw93FGx7B0NzD4tnOJtA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728741AbfLJVMt (ORCPT ); Tue, 10 Dec 2019 16:12:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:37808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729094AbfLJVMr (ORCPT ); Tue, 10 Dec 2019 16:12:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 16E6E24656; Tue, 10 Dec 2019 21:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012366; bh=uGc5dOvIk4aVUvA8p0bFiGv122bgR82WQjrjtSSwxsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWHf6gT4Zn5kV0vTE7ltW2o/N3qXxwA+eP3a8Ced4RYbbzWjYvYCOjvkySEPU2V94 aROAX6isALsH6LRTVn6VejR3bXxjtiYH+4rT+J2fottR8IBpI/YxIFRyEnROiT8+NF LggVo27OXSuGeH0PKTLfQVOIjFCksPom8lgH9xvI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pascal Paillet , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.4 293/350] regulator: core: Let boot-on regulators be powered off Date: Tue, 10 Dec 2019 16:06:38 -0500 Message-Id: <20191210210735.9077-254-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210210735.9077-1-sashal@kernel.org> References: <20191210210735.9077-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pascal Paillet [ Upstream commit 089b3f61ecfc43ca4ea26d595e1d31ead6de3f7b ] Boot-on regulators are always kept on because their use_count value is now incremented at boot time and never cleaned. Only increment count value for alway-on regulators. regulator_late_cleanup() is now able to power off boot-on regulators when unused. Fixes: 05f224ca6693 ("regulator: core: Clean enabling always-on regulators + their supplies") Signed-off-by: Pascal Paillet Link: https://lore.kernel.org/r/20191113102737.27831-1-p.paillet@st.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 51ce280c1ce13..87bc06b386a04 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1403,7 +1403,9 @@ static int set_machine_constraints(struct regulator_dev *rdev, rdev_err(rdev, "failed to enable\n"); return ret; } - rdev->use_count++; + + if (rdev->constraints->always_on) + rdev->use_count++; } print_constraints(rdev); -- 2.20.1