diff options
Diffstat (limited to 'drivers/regulator/mt6380-regulator.c')
| -rw-r--r-- | drivers/regulator/mt6380-regulator.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/regulator/mt6380-regulator.c b/drivers/regulator/mt6380-regulator.c index 9efd8710a6f3..83e50df7f7c3 100644 --- a/drivers/regulator/mt6380-regulator.c +++ b/drivers/regulator/mt6380-regulator.c @@ -183,7 +183,7 @@ static const unsigned int ldo_volt_table4[] = { static int mt6380_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode) { - int ret, val = 0; + int val = 0; struct mt6380_regulator_info *info = rdev_get_drvdata(rdev); switch (mode) { @@ -199,10 +199,8 @@ static int mt6380_regulator_set_mode(struct regulator_dev *rdev, val <<= ffs(info->modeset_mask) - 1; - ret = regmap_update_bits(rdev->regmap, info->modeset_reg, + return regmap_update_bits(rdev->regmap, info->modeset_reg, info->modeset_mask, val); - - return ret; } static unsigned int mt6380_regulator_get_mode(struct regulator_dev *rdev) @@ -321,7 +319,7 @@ static const struct platform_device_id mt6380_platform_ids[] = { }; MODULE_DEVICE_TABLE(platform, mt6380_platform_ids); -static const struct of_device_id mt6380_of_match[] = { +static const struct of_device_id __maybe_unused mt6380_of_match[] = { { .compatible = "mediatek,mt6380-regulator", }, { /* sentinel */ }, }; @@ -330,6 +328,7 @@ MODULE_DEVICE_TABLE(of, mt6380_of_match); static struct platform_driver mt6380_regulator_driver = { .driver = { .name = "mt6380-regulator", + .probe_type = PROBE_PREFER_ASYNCHRONOUS, .of_match_table = of_match_ptr(mt6380_of_match), }, .probe = mt6380_regulator_probe, |