korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: hikey9xx: hi6421v600-regulator: get rid of an static data

Browse Source 
Move it to be inside the private data struct.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/ff8b6852c788fd476743eb4ce556e4a97f4b928e.1611212783.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-01-21 08:18:09 +01:00 committed by Greg Kroah-Hartman
parent 0b5a562a9e
commit 6436a12504
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/hikey9xx/hi6421v600-regulator.c
View File

@ -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 */