mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
regulator: pfuze100-regulator: Remove global variable
We should better not use a global 'struct pfuze_regulator' variable, as this could cause problems if multiple regulator chips are used. Place it inside the private struct instead. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
1a695a905c
commit
124256548f
1 changed files with 6 additions and 7 deletions
|
@ -70,6 +70,7 @@ struct pfuze_chip {
|
|||
struct device *dev;
|
||||
struct pfuze_regulator regulator_descs[PFUZE100_MAX_REGULATOR];
|
||||
struct regulator_dev *regulators[PFUZE100_MAX_REGULATOR];
|
||||
struct pfuze_regulator *pfuze_regulators;
|
||||
};
|
||||
|
||||
static const int pfuze100_swbst[] = {
|
||||
|
@ -334,8 +335,6 @@ static struct pfuze_regulator pfuze3000_regulators[] = {
|
|||
PFUZE100_VGEN_REG(PFUZE3000, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000),
|
||||
};
|
||||
|
||||
static struct pfuze_regulator *pfuze_regulators;
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
/* PFUZE100 */
|
||||
static struct of_regulator_match pfuze100_matches[] = {
|
||||
|
@ -563,21 +562,21 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
|
|||
/* use the right regulators after identify the right device */
|
||||
switch (pfuze_chip->chip_id) {
|
||||
case PFUZE3000:
|
||||
pfuze_regulators = pfuze3000_regulators;
|
||||
pfuze_chip->pfuze_regulators = pfuze3000_regulators;
|
||||
regulator_num = ARRAY_SIZE(pfuze3000_regulators);
|
||||
sw_check_start = PFUZE3000_SW2;
|
||||
sw_check_end = PFUZE3000_SW2;
|
||||
sw_hi = 1 << 3;
|
||||
break;
|
||||
case PFUZE200:
|
||||
pfuze_regulators = pfuze200_regulators;
|
||||
pfuze_chip->pfuze_regulators = pfuze200_regulators;
|
||||
regulator_num = ARRAY_SIZE(pfuze200_regulators);
|
||||
sw_check_start = PFUZE200_SW2;
|
||||
sw_check_end = PFUZE200_SW3B;
|
||||
break;
|
||||
case PFUZE100:
|
||||
default:
|
||||
pfuze_regulators = pfuze100_regulators;
|
||||
pfuze_chip->pfuze_regulators = pfuze100_regulators;
|
||||
regulator_num = ARRAY_SIZE(pfuze100_regulators);
|
||||
sw_check_start = PFUZE100_SW2;
|
||||
sw_check_end = PFUZE100_SW4;
|
||||
|
@ -587,7 +586,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
|
|||
(pfuze_chip->chip_id == PFUZE100) ? "100" :
|
||||
((pfuze_chip->chip_id == PFUZE200) ? "200" : "3000"));
|
||||
|
||||
memcpy(pfuze_chip->regulator_descs, pfuze_regulators,
|
||||
memcpy(pfuze_chip->regulator_descs, pfuze_chip->pfuze_regulators,
|
||||
sizeof(pfuze_chip->regulator_descs));
|
||||
|
||||
ret = pfuze_parse_regulators_dt(pfuze_chip);
|
||||
|
@ -631,7 +630,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
|
|||
devm_regulator_register(&client->dev, desc, &config);
|
||||
if (IS_ERR(pfuze_chip->regulators[i])) {
|
||||
dev_err(&client->dev, "register regulator%s failed\n",
|
||||
pfuze_regulators[i].desc.name);
|
||||
pfuze_chip->pfuze_regulators[i].desc.name);
|
||||
return PTR_ERR(pfuze_chip->regulators[i]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue