Merge "regulator: qcom_pm8008-regulator: correct chip-en chip variable type"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
154900b51b
@@ -710,7 +710,7 @@ static int pm8008_regulator_probe(struct platform_device *pdev)
|
|||||||
/* PM8008 chip enable regulator callbacks */
|
/* PM8008 chip enable regulator callbacks */
|
||||||
static int pm8008_enable_regulator_enable(struct regulator_dev *rdev)
|
static int pm8008_enable_regulator_enable(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct pm8008_regulator *chip = rdev_get_drvdata(rdev);
|
struct pm8008_chip *chip = rdev_get_drvdata(rdev);
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
|
rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
|
||||||
@@ -726,7 +726,7 @@ static int pm8008_enable_regulator_enable(struct regulator_dev *rdev)
|
|||||||
|
|
||||||
static int pm8008_enable_regulator_disable(struct regulator_dev *rdev)
|
static int pm8008_enable_regulator_disable(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct pm8008_regulator *chip = rdev_get_drvdata(rdev);
|
struct pm8008_chip *chip = rdev_get_drvdata(rdev);
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
|
rc = pm8008_masked_write(chip->regmap, MISC_CHIP_ENABLE_REG,
|
||||||
@@ -742,7 +742,7 @@ static int pm8008_enable_regulator_disable(struct regulator_dev *rdev)
|
|||||||
|
|
||||||
static int pm8008_enable_regulator_is_enabled(struct regulator_dev *rdev)
|
static int pm8008_enable_regulator_is_enabled(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct pm8008_regulator *chip = rdev_get_drvdata(rdev);
|
struct pm8008_chip *chip = rdev_get_drvdata(rdev);
|
||||||
int rc;
|
int rc;
|
||||||
u8 reg;
|
u8 reg;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user