Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree

[Doug Anderson]

Hi,

On Tue, Nov 20, 2018 at 8:28 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> The patch
>
>    regulator: core: add enable_count for consumers to debug fs
>
> has been applied to the regulator tree at
>
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
>
> All being well this means that it will be integrated into the linux-next
> tree (usually sometime in the next 24 hours) and sent to Linus during
> the next merge window (or sooner if it is a bug fix), however if
> problems are discovered then the patch may be dropped or reverted.
>
> You may get further e-mails resulting from automated or manual testing
> and review of the tree, please engage with people reporting problems and
> send followup patches addressing any issues that are reported if needed.
>
> If any updates are required or you are submitting further changes they
> should be sent as incremental updates against current git, existing
> patches will not be replaced.
>
> Please add any relevant lists and maintainers to the CCs when replying
> to this mail.
>
> Thanks,
> Mark
>
> From f556213bad39e3e28fe62a8126eb04c0d64e0b5b Mon Sep 17 00:00:00 2001
> From: Douglas Anderson <dianders@xxxxxxxxxxxx>
> Date: Mon, 19 Nov 2018 16:26:52 -0800
> Subject: [PATCH] regulator: core: add enable_count for consumers to debug fs
>
> Now that consumers all keep track of their own enable count, let's add
> it into the regulator_summary.
>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>  drivers/regulator/core.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index ff5ca185bb8f..76ae6c0d734d 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -5225,8 +5225,11 @@ static void regulator_summary_show_subtree(struct seq_file *s,
>
>                 switch (rdev->desc->type) {
>                 case REGULATOR_VOLTAGE:
> -                       seq_printf(s, "%37dmA %5dmV %5dmV",
> +                       seq_printf(s, "%3d %33dmA%c%5dmV %5dmV",
> +                                  consumer->enable_count,
>                                    consumer->uA_load / 1000,
> +                                  consumer->uA_load && !consumer->enable_count ?
> +                                  '*' : ' ',

Hold up!  How does this compile for you?  It looks as if you landed it
before ("regulator: core: Only count load for enabled consumers")
which is the patch that adds "enable_count" to the consumer structure.

I'm just working on my replies to you about the dependencies on these
patches but they're definitely not separate...

-Doug