On Tue, Aug 11, 2020 at 05:41:30PM +0200, Mauro Carvalho Chehab wrote:
> There are some checks there which could make sense for
> downstream builds, but doesn't make much sense for
> upstream ones. They came from the official Hikey970 tree
> from Linaro, but even there, the commented-out code is not
> set via other Kconfig vars.

> So, let's just get rid of that. If needed later, this
> patch can be (partially?) reversed.

> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  drivers/mfd/hisi_pmic_spmi.c            |  63 --------
>  drivers/regulator/hisi_regulator_spmi.c | 196 +-----------------------
>  include/linux/mfd/hisi_pmic.h           |  42 -----
>  3 files changed, 8 insertions(+), 293 deletions(-)

This is fixing stuff added in the previous patch, please just fold these
fixes into the first patch.