From patchwork Tue Jan 23 11:59:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 125503 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1711184ljf; Tue, 23 Jan 2018 04:01:01 -0800 (PST) X-Google-Smtp-Source: AH8x2275WsgZ+wqb9W+5rVX6WD1Ssd4vn1m7dDa1QJugl6mpICERD1ITBRbRWkI/V6U8OBVhmJC2 X-Received: by 2002:a17:902:3084:: with SMTP id v4-v6mr4640601plb.61.1516708861125; Tue, 23 Jan 2018 04:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516708861; cv=none; d=google.com; s=arc-20160816; b=f/MTc1It/GBTaJkg2c5OwU2FKq/G2W1LkZtxZ7NsXtXniYxWXDH+R+IKvNHwXwvU7q botk0qk8ZUWVyF8tU/tlQb/jDnOjocsWzqYJ1o09v+HTj5cl1978+n8JMGFceWZX7asq H6GuezRymX0bl9Z8EjxdUNtU9BoEDy97HXxgNVLk/glsrcdk3aHqXDnTo28snM6hzu3V NQdhiGVtUTL/+05NRtzaNEP65AerNzfmoaywiseSThWOnLQLvvrMIFb+WplKcJhYBJsM 42GR0wsMWZOutMLAzgWH3bhj+u1KclexLcH76cZoi5Cv53MmX8HhBXZZE3aeE3fdjqMd jB1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=X6L1uBKnd2nmWo6NCCsYWIOQXZkzfLCnhgSRlvduXic=; b=O2umkIj2mbaRocKF4Y0gsQm4+Uy00umH3eKEbOMeSt6HneA7hSIh/bkqGN6WUk7EDV MiunSn6CBiIM97fYNh7n8qDw/FGzqrWMSVoL9AnUIl80avITYI3QGfG9UaEW/qOH2koV F0AewgpUSepOAk82+/vmYlXC7Vv3TLXeIRamNAR8D8fsVcIiQtRI8fcXA5j2nWNhulUK 3x4xnQ9tdjB1b4i+UdrwhL84DiSCLw0/hItpykncLcI8UG2bxXNaImptMW+LcbRMQJM7 dnuqXopOq8RgqNcdBWOpehM5IGataxyl17vTQEUq+8kKHk4GsEEooqaGRqVGypxnH0x5 MnnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hPuB5XBx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l59-v6si4624140plb.743.2018.01.23.04.01.00; Tue, 23 Jan 2018 04:01:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hPuB5XBx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751382AbeAWMA7 (ORCPT + 6 others); Tue, 23 Jan 2018 07:00:59 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:44155 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751169AbeAWMA4 (ORCPT ); Tue, 23 Jan 2018 07:00:56 -0500 Received: by mail-pg0-f67.google.com with SMTP id m20so121867pgc.11 for ; Tue, 23 Jan 2018 04:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PgJpBAWoL6UfAEBRKx+NUQscAn0hvzT2js/EGzJp15w=; b=hPuB5XBxhv+tsegvEHW8c2zxSxLZrM4to0IY4SCB3Lw/1nGj9JPl2/ocUEXTN0u5Rr RNr4WpZQEJ+9z3tPXFU1gkF5K8S13u12YGeiIGlg22tbx5RE8U7/B3dR2vM9pY9EeASa yb0FpYfdhZvsmu1SNHVa3hVp3MCBI4dXOByhw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PgJpBAWoL6UfAEBRKx+NUQscAn0hvzT2js/EGzJp15w=; b=gGcQG0eo7qEoYXAyO2ClZxXNxVlVjt2VJq3vqMl+gg3zJBDtITezmFpK4dh1gfWeZI atUHG1sYyYdxCd+UIsJqv9A3hJHkhhgJqYiP9xOop8xe7s8LmpcVSAOTJ4DUiUGZBQ74 a5feehxb/MfNX97DsNIBfSG+aw1hZZbimEw3oLj7w26soUmk6w5QQHc88BfZbZWiz62p ndghwSxp6At8rzZ0NJSxR39ZNODTeuj+IZXgq+dJiq0hQw1C8KnCbLQm2ZN2Wn65iqqY QgjFl7Y5FK9bLvPE55ZNnkuIPHVd/HCC4n12/saTNEtd9EGt0FqIAc7WvOZBJS7/R3dL LAGQ== X-Gm-Message-State: AKwxytdTqL3tcvWz6qw5pSRhvNFxDkZxYU7D9u5ShQQwHycn7mi/7Few qIUzXeBlM7ahKeIxZ8TLz6OQXw== X-Received: by 10.101.80.204 with SMTP id s12mr8828833pgp.185.1516708856357; Tue, 23 Jan 2018 04:00:56 -0800 (PST) Received: from ubt.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id p75sm5853049pfi.148.2018.01.23.04.00.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 04:00:55 -0800 (PST) From: Chunyan Zhang To: Mark Brown , Rob Herring Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chunyan Zhang Subject: [PATCH V4 4/5] drivers: regulator: empty the old suspend functions Date: Tue, 23 Jan 2018 19:59:42 +0800 Message-Id: <1516708783-6288-4-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516708783-6288-1-git-send-email-zhang.chunyan@linaro.org> References: <1516708783-6288-1-git-send-email-zhang.chunyan@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Regualtor suspend/resume functions should only be called by PM suspend core via registering dev_pm_ops, and regulator devices should implement the callback functions. Thus, any regulator consumer shouldn't call the regulator suspend/resume functions directly. In order to avoid compile errors, two empty functions with the same name still be left for the time being. Signed-off-by: Chunyan Zhang --- drivers/regulator/core.c | 74 --------------------------------------- include/linux/regulator/machine.h | 5 ++- 2 files changed, 2 insertions(+), 77 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5ea80e9..080c233 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4179,80 +4179,6 @@ void regulator_unregister(struct regulator_dev *rdev) } EXPORT_SYMBOL_GPL(regulator_unregister); -static int _regulator_suspend_prepare(struct device *dev, void *data) -{ - struct regulator_dev *rdev = dev_to_rdev(dev); - const suspend_state_t *state = data; - int ret; - - mutex_lock(&rdev->mutex); - ret = suspend_prepare(rdev, *state); - mutex_unlock(&rdev->mutex); - - return ret; -} - -/** - * regulator_suspend_prepare - prepare regulators for system wide suspend - * @state: system suspend state - * - * Configure each regulator with it's suspend operating parameters for state. - * This will usually be called by machine suspend code prior to supending. - */ -int regulator_suspend_prepare(suspend_state_t state) -{ - /* ON is handled by regulator active state */ - if (state == PM_SUSPEND_ON) - return -EINVAL; - - return class_for_each_device(®ulator_class, NULL, &state, - _regulator_suspend_prepare); -} -EXPORT_SYMBOL_GPL(regulator_suspend_prepare); - -static int _regulator_suspend_finish(struct device *dev, void *data) -{ - struct regulator_dev *rdev = dev_to_rdev(dev); - int ret; - - mutex_lock(&rdev->mutex); - if (rdev->use_count > 0 || rdev->constraints->always_on) { - if (!_regulator_is_enabled(rdev)) { - ret = _regulator_do_enable(rdev); - if (ret) - dev_err(dev, - "Failed to resume regulator %d\n", - ret); - } - } else { - if (!have_full_constraints()) - goto unlock; - if (!_regulator_is_enabled(rdev)) - goto unlock; - - ret = _regulator_do_disable(rdev); - if (ret) - dev_err(dev, "Failed to suspend regulator %d\n", ret); - } -unlock: - mutex_unlock(&rdev->mutex); - - /* Keep processing regulators in spite of any errors */ - return 0; -} - -/** - * regulator_suspend_finish - resume regulators from system wide suspend - * - * Turn on regulators that might be turned off by regulator_suspend_prepare - * and that should be turned on according to the regulators properties. - */ -int regulator_suspend_finish(void) -{ - return class_for_each_device(®ulator_class, NULL, NULL, - _regulator_suspend_finish); -} -EXPORT_SYMBOL_GPL(regulator_suspend_finish); /** * regulator_has_full_constraints - the system has fully specified constraints diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index ce89c55..c4a56df 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -236,12 +236,12 @@ struct regulator_init_data { #ifdef CONFIG_REGULATOR void regulator_has_full_constraints(void); -int regulator_suspend_prepare(suspend_state_t state); -int regulator_suspend_finish(void); #else static inline void regulator_has_full_constraints(void) { } +#endif + static inline int regulator_suspend_prepare(suspend_state_t state) { return 0; @@ -250,6 +250,5 @@ static inline int regulator_suspend_finish(void) { return 0; } -#endif #endif