[PATCH v5 07/21] staging: hikey9xx: hi6421v600-regulator: get rid of an static data

Mauro Carvalho Chehab
2021-01-21T07:20:09Z

Move it to be inside the private data struct.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/staging/hikey9xx/hi6421v600-regulator.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c
index 54ad07418ec2..e25e596f58cf 100644
--- a/drivers/staging/hikey9xx/hi6421v600-regulator.c
+++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c
@@ -28,9 +28,10 @@ struct hi6421_spmi_reg_info {
struct hi6421_spmi_pmic *pmic;
u8 eco_mode_mask;
u32 eco_uA;
-};

-static DEFINE_MUTEX(enable_mutex);
+ /* Serialize regulator enable logic */
+ struct mutex enable_mutex;
+};

static const unsigned int ldo3_voltages[] = {
1500000, 1550000, 1600000, 1650000,
@@ -118,7 +119,7 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
struct hi6421_spmi_pmic *pmic = sreg->pmic;

/* cannot enable more than one regulator at one time */
- mutex_lock(&enable_mutex);
+ mutex_lock(&sreg->enable_mutex);
usleep_range(HISI_REGS_ENA_PROTECT_TIME,
HISI_REGS_ENA_PROTECT_TIME + 1000);

@@ -127,7 +128,7 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
rdev->desc->enable_mask,
rdev->desc->enable_mask);

- mutex_unlock(&enable_mutex);
+ mutex_unlock(&sreg->enable_mutex);

return 0;
}
@@ -312,6 +313,7 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
return -ENOMEM;

sreg->pmic = pmic;
+ mutex_init(&sreg->enable_mutex);

for (i = 0; i < ARRAY_SIZE(regulator_info); i++) {
/* assign per-regulator data */
--
2.29.2