diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2018-06-11 13:58:45 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-07-04 08:16:25 +0200 |
| commit | 492510dd7d39794e809d8218a2839e857c101ce5 (patch) | |
| tree | 41dad2e3407fbe25d683c457549eaa0ca0385183 /drivers/regulator/da9063-regulator.c | |
| parent | mfd: da9063: Rename PMIC_DA9063 to PMIC_CHIP_ID_DA9063 (diff) | |
| download | linux-492510dd7d39794e809d8218a2839e857c101ce5.tar.xz linux-492510dd7d39794e809d8218a2839e857c101ce5.zip | |
mfd: da9063: Replace model with type
The model number stored in the struct da9063 is the same for all
variants of the da9063 since it is the chip ID, which is always
the same. Replace that with a separate identifier instead, which
allows us to discern the DA9063 variants by setting the type
based on either DT match or otherwise.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/regulator/da9063-regulator.c')
| -rw-r--r-- | drivers/regulator/da9063-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c index 7f4ac0413182..27ba2a1d14a3 100644 --- a/drivers/regulator/da9063-regulator.c +++ b/drivers/regulator/da9063-regulator.c @@ -98,7 +98,7 @@ struct da9063_regulator_info { struct da9063_dev_model { const struct da9063_regulator_info *regulator_info; unsigned n_regulators; - unsigned dev_model; + enum da9063_type type; }; /* Single regulator settings */ @@ -585,7 +585,7 @@ static struct da9063_dev_model regulators_models[] = { { .regulator_info = da9063_regulator_info, .n_regulators = ARRAY_SIZE(da9063_regulator_info), - .dev_model = PMIC_CHIP_ID_DA9063, + .type = PMIC_TYPE_DA9063, }, { } }; @@ -741,12 +741,12 @@ static int da9063_regulator_probe(struct platform_device *pdev) /* Find regulators set for particular device model */ for (model = regulators_models; model->regulator_info; model++) { - if (model->dev_model == da9063->model) + if (model->type == da9063->type) break; } if (!model->regulator_info) { dev_err(&pdev->dev, "Chip model not recognised (%u)\n", - da9063->model); + da9063->type); return -ENODEV; } |