On Mon, Mar 18, 2019 at 04:47:58PM +0100, Wolfram Sang wrote:
> With OF being the only configuration possibility left, depend on it to
> simplify some code.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
> ---
> drivers/regulator/Kconfig | 2 +-
> drivers/regulator/da9063-regulator.c | 10 ----------
> 2 files changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
> index b7f249ee5e68..6663cd6cb96c 100644
> --- a/drivers/regulator/Kconfig
> +++ b/drivers/regulator/Kconfig
> @@ -256,7 +256,7 @@ config REGULATOR_DA9062
>
> config REGULATOR_DA9063
> tristate "Dialog Semiconductor DA9063 regulators"
> - depends on MFD_DA9063
> + depends on MFD_DA9063 && OF
> help
> Say y here to support the BUCKs and LDOs regulators found on
> DA9063 PMICs.
> diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
> index c05859ad63d8..2eda8d985756 100644
> --- a/drivers/regulator/da9063-regulator.c
> +++ b/drivers/regulator/da9063-regulator.c
> @@ -681,7 +681,6 @@ static const struct regulator_init_data *da9063_get_regulator_initdata(
> return NULL;
> }
>
> -#ifdef CONFIG_OF
> static struct of_regulator_match da9063_matches[] = {
> [DA9063_ID_BCORE1] = { .name = "bcore1" },
> [DA9063_ID_BCORE2] = { .name = "bcore2" },
> @@ -759,15 +758,6 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt(
> *da9063_reg_matches = da9063_matches;
> return pdata;
> }
> -#else
> -static struct da9063_regulators_pdata *da9063_parse_regulators_dt(
> - struct platform_device *pdev,
> - struct of_regulator_match **da9063_reg_matches)
> -{
> - *da9063_reg_matches = NULL;
> - return ERR_PTR(-ENODEV);
> -}
> -#endif
>
> static int da9063_regulator_probe(struct platform_device *pdev)
> {
> --
> 2.11.0
>
