From patchwork Thu Aug 16 20:28:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10568119 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 062D5109C for ; Thu, 16 Aug 2018 20:29:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E20932B9B1 for ; Thu, 16 Aug 2018 20:28:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D64DA2B9B4; Thu, 16 Aug 2018 20:28:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78DB12B9B1 for ; Thu, 16 Aug 2018 20:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725855AbeHPX33 (ORCPT ); Thu, 16 Aug 2018 19:29:29 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:34358 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725892AbeHPX32 (ORCPT ); Thu, 16 Aug 2018 19:29:28 -0400 Received: by mail-pl0-f67.google.com with SMTP id f6-v6so2629733plo.1 for ; Thu, 16 Aug 2018 13:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8bOvOReGf7yVHhNU1ZeGyQl2H33R2y45ruh4KEVYJe8=; b=PAc8k7mvSxhs2ACYSRLLR8UEKlib42DjlZkaZZMa6MmV5G544D6Uwyzpv+QNdXvFfA RNX9Mu1hvunTEyvSWZssnD4Zyp8nPz7h1gd1WTk1yj5L4OyIaf/d65PQAwbw4GA9rw6F RG8MSBlo+P9suGTLtH7Kplmu7kft631kqjWK4= 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:mime-version:content-transfer-encoding; bh=8bOvOReGf7yVHhNU1ZeGyQl2H33R2y45ruh4KEVYJe8=; b=NptYwQaUIjT0ZUpaPvSwoj4eWW2bUSR04vUlLtyVZdLTmGwxN3ILjfN5glcu16HMxX SqMPgq1XqoQCJmztRnaI03xCykCjlPkmBNsTe/sJsGSMpKlaxWs/x9tpCbbj8aXBNYQm tVS7ggSkhcEHzQPt6IWNKNcDOTWAOd479DUHxfjBe8sh6eBogAqgW8n5A1CUI+6N0/+I k7ncX+AMQ/MCyVBdiQjZUHIBU3tYcbbANSjHMFFINtIAi8nTVChFxHpfA/o/y5+3KQxm 2ZpvQ/D97ejM9Zj5rha1kDICVrZuKb/cQlb6Ts8TH+0pMxmkmb+9A+PwpIbRcRdhH5A7 81kQ== X-Gm-Message-State: AOUpUlF/elBbOA6sTme0NMj0SUQ5NB0TYMmcDqk835J9guTQPPR78QlZ xzedJ/19ndQnoNloFbfFF5pvSQ== X-Google-Smtp-Source: AA+uWPyrXqOXrxBBiJWTfhRU7LNOnE+G90kQa1h6+mQL2JmTt0KRLg0HbF5CW/Vi8e7VzKgv8rWnZw== X-Received: by 2002:a17:902:262:: with SMTP id 89-v6mr30103651plc.221.1534451335302; Thu, 16 Aug 2018 13:28:55 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id t76-v6sm209647pfe.109.2018.08.16.13.28.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 13:28:54 -0700 (PDT) From: Douglas Anderson To: broonie@kernel.org Cc: linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, collinsd@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] regulator: core: Add the opmode to regulator_summary Date: Thu, 16 Aug 2018 13:28:01 -0700 Message-Id: <20180816202803.250079-2-dianders@chromium.org> X-Mailer: git-send-email 2.18.0.865.gffc8e1a3cd6-goog In-Reply-To: <20180816202803.250079-1-dianders@chromium.org> References: <20180816202803.250079-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's handy to know what opmode a regulator has been configured to in the summary. Add it. Signed-off-by: Douglas Anderson --- Changes in v2: None drivers/regulator/core.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6ed568b96c0e..00e931da887a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -426,19 +426,24 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RO(name); -static ssize_t regulator_print_opmode(char *buf, int mode) +static const char *regulator_opmode_to_str(int mode) { switch (mode) { case REGULATOR_MODE_FAST: - return sprintf(buf, "fast\n"); + return "fast"; case REGULATOR_MODE_NORMAL: - return sprintf(buf, "normal\n"); + return "normal"; case REGULATOR_MODE_IDLE: - return sprintf(buf, "idle\n"); + return "idle"; case REGULATOR_MODE_STANDBY: - return sprintf(buf, "standby\n"); + return "standby"; } - return sprintf(buf, "unknown\n"); + return "unknown"; +} + +static ssize_t regulator_print_opmode(char *buf, int mode) +{ + return sprintf(buf, "%s\n", regulator_opmode_to_str(mode)); } static ssize_t regulator_opmode_show(struct device *dev, @@ -4660,10 +4665,11 @@ static void regulator_summary_show_subtree(struct seq_file *s, if (!rdev) return; - seq_printf(s, "%*s%-*s %3d %4d %6d ", + seq_printf(s, "%*s%-*s %3d %4d %6d %7s ", level * 3 + 1, "", 30 - level * 3, rdev_get_name(rdev), - rdev->use_count, rdev->open_count, rdev->bypass_count); + rdev->use_count, rdev->open_count, rdev->bypass_count, + regulator_opmode_to_str(_regulator_get_mode(rdev))); seq_printf(s, "%5dmV ", _regulator_get_voltage(rdev) / 1000); seq_printf(s, "%5dmA ", _regulator_get_current_limit(rdev) / 1000); @@ -4695,7 +4701,7 @@ static void regulator_summary_show_subtree(struct seq_file *s, switch (rdev->desc->type) { case REGULATOR_VOLTAGE: - seq_printf(s, "%37dmV %5dmV", + seq_printf(s, "%45dmV %5dmV", consumer->voltage[PM_SUSPEND_ON].min_uV / 1000, consumer->voltage[PM_SUSPEND_ON].max_uV / 1000); break; @@ -4727,8 +4733,8 @@ static int regulator_summary_show_roots(struct device *dev, void *data) static int regulator_summary_show(struct seq_file *s, void *data) { - seq_puts(s, " regulator use open bypass voltage current min max\n"); - seq_puts(s, "-------------------------------------------------------------------------------\n"); + seq_puts(s, " regulator use open bypass opmode voltage current min max\n"); + seq_puts(s, "---------------------------------------------------------------------------------------\n"); class_for_each_device(®ulator_class, NULL, s, regulator_summary_show_roots); From patchwork Thu Aug 16 20:28:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10568125 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5786E139A for ; Thu, 16 Aug 2018 20:29:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B3002B9B1 for ; Thu, 16 Aug 2018 20:29:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F0BE2B9B4; Thu, 16 Aug 2018 20:29:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBE5A2B9B1 for ; Thu, 16 Aug 2018 20:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726288AbeHPX3p (ORCPT ); Thu, 16 Aug 2018 19:29:45 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:39687 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726219AbeHPX3o (ORCPT ); Thu, 16 Aug 2018 19:29:44 -0400 Received: by mail-pl0-f67.google.com with SMTP id w14-v6so2620876plp.6 for ; Thu, 16 Aug 2018 13:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZjXGYI8zpzBPRQhl8pxxTVLVL1fpzO6NnA9rDuraYAM=; b=MLvyJC/DzMCQV6RzSuNeJPwc1BqHy41usVICel65IKTMB3V8IrtjQbCkaHhFD2QLfp 59So8mFX0xbYNQfTTInN+t3v063pESkY+vgpI93PN8DcYJcp106NkaflzCLPWiH76/ah UKR/HizAgdsQmd2NS0eZWsgozCiO4N7FlSX8w= 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:mime-version:content-transfer-encoding; bh=ZjXGYI8zpzBPRQhl8pxxTVLVL1fpzO6NnA9rDuraYAM=; b=SpPMXA9N9+Ospu3JLKa5f9nIBP+iXUHjljjW8Pn6QhvtaoJ602G45UhR0hOQWHWvUL rc/Hv1cw5gmpwsBKkOu3dDV2prfZC8kvpcr9OC8EwBXE3iWVM9YN7DIJDGZqHYCM9C0v pJQ4BNWDpbn6SeLjMYf1JvdBsmp+KyIvllZiGIDiqasvPjzVqa4cTjfc5At8rhWZELRj WggJvhlZjZV3wuMOm+m9qf5zTJ1DD/cb9A3As2mCPIFBmfxJozM+keBpb3SA1UT+QLC8 YvBg4LsdTRCBH4jCQMxeYOBquji4Pot59Ye/Yr/v8Jscm821+YFN36AZMZwT3YExFBqu jbsA== X-Gm-Message-State: AOUpUlF8e/XDV+tMGZJ2TeT60CBZx13qm6OVSRBr+qNydci+9B+x2Q3a ubajrCruQUp7arKIZaCETPUdcQ== X-Google-Smtp-Source: AA+uWPw7PJS3R8exmIFneilUPpbF1G7AKJ349YBh9KxeSfSJgoV4QBT7yKUJd4cdrCwH/+Tv2e0GCw== X-Received: by 2002:a17:902:722:: with SMTP id 31-v6mr30761700pli.207.1534451336593; Thu, 16 Aug 2018 13:28:56 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id t76-v6sm209647pfe.109.2018.08.16.13.28.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 13:28:55 -0700 (PDT) From: Douglas Anderson To: broonie@kernel.org Cc: linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, collinsd@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] regulator: core: Add consumer-requested load in regulator_summary Date: Thu, 16 Aug 2018 13:28:02 -0700 Message-Id: <20180816202803.250079-3-dianders@chromium.org> X-Mailer: git-send-email 2.18.0.865.gffc8e1a3cd6-goog In-Reply-To: <20180816202803.250079-1-dianders@chromium.org> References: <20180816202803.250079-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's handy to see the load requested by a regulator consumer in the regulator_summary. Add it. Signed-off-by: Douglas Anderson --- Changes in v2: - No longer consider consumers that don't call regulator_set_load(). drivers/regulator/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 00e931da887a..1e2dc8d09075 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4701,7 +4701,8 @@ static void regulator_summary_show_subtree(struct seq_file *s, switch (rdev->desc->type) { case REGULATOR_VOLTAGE: - seq_printf(s, "%45dmV %5dmV", + seq_printf(s, "%37dmA %5dmV %5dmV", + consumer->uA_load / 1000, consumer->voltage[PM_SUSPEND_ON].min_uV / 1000, consumer->voltage[PM_SUSPEND_ON].max_uV / 1000); break; From patchwork Thu Aug 16 20:28:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10568121 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DC66109C for ; Thu, 16 Aug 2018 20:29:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F3652B9B1 for ; Thu, 16 Aug 2018 20:29:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733892B9B4; Thu, 16 Aug 2018 20:29:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08CFA2B9B1 for ; Thu, 16 Aug 2018 20:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726170AbeHPX3i (ORCPT ); Thu, 16 Aug 2018 19:29:38 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:41755 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbeHPX3i (ORCPT ); Thu, 16 Aug 2018 19:29:38 -0400 Received: by mail-pl0-f68.google.com with SMTP id w19-v6so2613330ply.8 for ; Thu, 16 Aug 2018 13:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w7Wphlzb9MyK0taAOg/N66aiORw+y2yAt3Sx+0/JxpQ=; b=RM7d/JtBTH9+ddsJPLpMHR9J08jjqf+7xgW9tb8w4d/Mn/HxpbDrEgjaNhwHjgGXUN qW76X0gRpvsYpE6lstrIhWv5e/OKxrcSt/UK1KT0TpplCuBU27FAxUeXFTXVr9aUMzIf Nn0ixMKJVTCZ2yHXCECr2FCeBx4BCBozBOM6o= 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:mime-version:content-transfer-encoding; bh=w7Wphlzb9MyK0taAOg/N66aiORw+y2yAt3Sx+0/JxpQ=; b=EQzwkxx0uiieNjmwiDEs/MJ3zI/1chTMM4o8WHdfHD3xGfUlUL3FQ4b3c/UZ8mng0u gCFTxqqE17FkDOQQEix/iaMxzxKortVpTeceu6K2nkCxDKurmIBYTJ18Di2bXrsZfcXZ RC8ADnr1jhUJMaI8t3bmtCu8R1dwJKPMguAJEpwCVMYmQLcb7I1G6fhlJA+kcfNyuhar URGydm01zz+GX/h7ec+St+DuFhjivFwD1GKsCyfoLaSM8uqRRE1HZCflIdqlHrE0/8GZ CYr3Kyfrf2QTB0hvjLgPeAXkzolF3yjUE0D6u8KN41ArYJWsdpkIlgs/QYTXOptRk/wa CpuA== X-Gm-Message-State: AOUpUlF4qy4WIBfyBGuerTUe6wmGi7U4wLTMxa0I/bY5ritHziGbZg8S VsjCCj+5mLl/7bXN6CNK5XDmwW64YkM= X-Google-Smtp-Source: AA+uWPyOT6veSG5LvTj0oG1K0MaDZ9fJw5DNV0uys4awJdeffBrb8jSnRbaOm5HPmYIuiWFqnCng+w== X-Received: by 2002:a17:902:82c7:: with SMTP id u7-v6mr2509651plz.83.1534451337960; Thu, 16 Aug 2018 13:28:57 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id t76-v6sm209647pfe.109.2018.08.16.13.28.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Aug 2018 13:28:57 -0700 (PDT) From: Douglas Anderson To: broonie@kernel.org Cc: linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, collinsd@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] regulator: core: Add locking to debugfs regulator_summary Date: Thu, 16 Aug 2018 13:28:03 -0700 Message-Id: <20180816202803.250079-4-dianders@chromium.org> X-Mailer: git-send-email 2.18.0.865.gffc8e1a3cd6-goog In-Reply-To: <20180816202803.250079-1-dianders@chromium.org> References: <20180816202803.250079-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Most functions that access the rdev lock the rdev mutex before looking at data. ...but not the code that implements the debugfs regulator_summary. It probably should though, so let's do it. Note: this fixes no known issues. The problem was found only by code inspection. Signed-off-by: Douglas Anderson --- Changes in v2: None drivers/regulator/core.c | 51 ++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1e2dc8d09075..d350bcabdf20 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3461,21 +3461,23 @@ int regulator_set_current_limit(struct regulator *regulator, } EXPORT_SYMBOL_GPL(regulator_set_current_limit); +static int _regulator_get_current_limit_unlocked(struct regulator_dev *rdev) +{ + /* sanity check */ + if (!rdev->desc->ops->get_current_limit) + return -EINVAL; + + return rdev->desc->ops->get_current_limit(rdev); +} + static int _regulator_get_current_limit(struct regulator_dev *rdev) { int ret; regulator_lock(rdev); - - /* sanity check */ - if (!rdev->desc->ops->get_current_limit) { - ret = -EINVAL; - goto out; - } - - ret = rdev->desc->ops->get_current_limit(rdev); -out: + ret = _regulator_get_current_limit_unlocked(rdev); regulator_unlock(rdev); + return ret; } @@ -3540,21 +3542,23 @@ int regulator_set_mode(struct regulator *regulator, unsigned int mode) } EXPORT_SYMBOL_GPL(regulator_set_mode); +static unsigned int _regulator_get_mode_unlocked(struct regulator_dev *rdev) +{ + /* sanity check */ + if (!rdev->desc->ops->get_mode) + return -EINVAL; + + return rdev->desc->ops->get_mode(rdev); +} + static unsigned int _regulator_get_mode(struct regulator_dev *rdev) { int ret; regulator_lock(rdev); - - /* sanity check */ - if (!rdev->desc->ops->get_mode) { - ret = -EINVAL; - goto out; - } - - ret = rdev->desc->ops->get_mode(rdev); -out: + ret = _regulator_get_mode_unlocked(rdev); regulator_unlock(rdev); + return ret; } @@ -4661,18 +4665,23 @@ static void regulator_summary_show_subtree(struct seq_file *s, struct regulation_constraints *c; struct regulator *consumer; struct summary_data summary_data; + unsigned int opmode; if (!rdev) return; + regulator_lock_nested(rdev, level); + + opmode = _regulator_get_mode_unlocked(rdev); seq_printf(s, "%*s%-*s %3d %4d %6d %7s ", level * 3 + 1, "", 30 - level * 3, rdev_get_name(rdev), rdev->use_count, rdev->open_count, rdev->bypass_count, - regulator_opmode_to_str(_regulator_get_mode(rdev))); + regulator_opmode_to_str(opmode)); seq_printf(s, "%5dmV ", _regulator_get_voltage(rdev) / 1000); - seq_printf(s, "%5dmA ", _regulator_get_current_limit(rdev) / 1000); + seq_printf(s, "%5dmA ", + _regulator_get_current_limit_unlocked(rdev) / 1000); c = rdev->constraints; if (c) { @@ -4719,6 +4728,8 @@ static void regulator_summary_show_subtree(struct seq_file *s, class_for_each_device(®ulator_class, NULL, &summary_data, regulator_summary_show_children); + + regulator_unlock(rdev); } static int regulator_summary_show_roots(struct device *dev, void *data)