Commit 7f8c8394 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: mt6315: Don't ignore devm_regulator_register failure

Also use dev_err instead of dev_notice for messages in error conditions.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210530020543.418634-1-axel.lin@ingics.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4c4fce17
...@@ -84,7 +84,7 @@ static unsigned int mt6315_regulator_get_mode(struct regulator_dev *rdev) ...@@ -84,7 +84,7 @@ static unsigned int mt6315_regulator_get_mode(struct regulator_dev *rdev)
modeset_mask = init->modeset_mask[rdev_get_id(rdev)]; modeset_mask = init->modeset_mask[rdev_get_id(rdev)];
ret = regmap_read(rdev->regmap, MT6315_BUCK_TOP_4PHASE_ANA_CON42, &regval); ret = regmap_read(rdev->regmap, MT6315_BUCK_TOP_4PHASE_ANA_CON42, &regval);
if (ret != 0) { if (ret != 0) {
dev_notice(&rdev->dev, "Failed to get mode: %d\n", ret); dev_err(&rdev->dev, "Failed to get mode: %d\n", ret);
return ret; return ret;
} }
...@@ -93,7 +93,7 @@ static unsigned int mt6315_regulator_get_mode(struct regulator_dev *rdev) ...@@ -93,7 +93,7 @@ static unsigned int mt6315_regulator_get_mode(struct regulator_dev *rdev)
ret = regmap_read(rdev->regmap, MT6315_BUCK_TOP_CON1, &regval); ret = regmap_read(rdev->regmap, MT6315_BUCK_TOP_CON1, &regval);
if (ret != 0) { if (ret != 0) {
dev_notice(&rdev->dev, "Failed to get lp mode: %d\n", ret); dev_err(&rdev->dev, "Failed to get lp mode: %d\n", ret);
return ret; return ret;
} }
...@@ -147,12 +147,12 @@ static int mt6315_regulator_set_mode(struct regulator_dev *rdev, ...@@ -147,12 +147,12 @@ static int mt6315_regulator_set_mode(struct regulator_dev *rdev,
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
dev_notice(&rdev->dev, "Unsupported mode: %d\n", mode); dev_err(&rdev->dev, "Unsupported mode: %d\n", mode);
break; break;
} }
if (ret != 0) { if (ret != 0) {
dev_notice(&rdev->dev, "Failed to set mode: %d\n", ret); dev_err(&rdev->dev, "Failed to set mode: %d\n", ret);
return ret; return ret;
} }
...@@ -168,7 +168,7 @@ static int mt6315_get_status(struct regulator_dev *rdev) ...@@ -168,7 +168,7 @@ static int mt6315_get_status(struct regulator_dev *rdev)
info = container_of(rdev->desc, struct mt6315_regulator_info, desc); info = container_of(rdev->desc, struct mt6315_regulator_info, desc);
ret = regmap_read(rdev->regmap, info->status_reg, &regval); ret = regmap_read(rdev->regmap, info->status_reg, &regval);
if (ret < 0) { if (ret < 0) {
dev_notice(&rdev->dev, "Failed to get enable reg: %d\n", ret); dev_err(&rdev->dev, "Failed to get enable reg: %d\n", ret);
return ret; return ret;
} }
...@@ -260,8 +260,9 @@ static int mt6315_regulator_probe(struct spmi_device *pdev) ...@@ -260,8 +260,9 @@ static int mt6315_regulator_probe(struct spmi_device *pdev)
config.driver_data = init_data; config.driver_data = init_data;
rdev = devm_regulator_register(dev, &mt6315_regulators[i].desc, &config); rdev = devm_regulator_register(dev, &mt6315_regulators[i].desc, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_notice(dev, "Failed to register %s\n", mt6315_regulators[i].desc.name); dev_err(dev, "Failed to register %s\n",
continue; mt6315_regulators[i].desc.name);
return PTR_ERR(rdev);
} }
} }
...@@ -279,7 +280,7 @@ static void mt6315_regulator_shutdown(struct spmi_device *pdev) ...@@ -279,7 +280,7 @@ static void mt6315_regulator_shutdown(struct spmi_device *pdev)
ret |= regmap_write(chip->regmap, MT6315_TOP_TMA_KEY, 0); ret |= regmap_write(chip->regmap, MT6315_TOP_TMA_KEY, 0);
ret |= regmap_write(chip->regmap, MT6315_TOP_TMA_KEY_H, 0); ret |= regmap_write(chip->regmap, MT6315_TOP_TMA_KEY_H, 0);
if (ret < 0) if (ret < 0)
dev_notice(&pdev->dev, "[%#x] Failed to enable power off sequence. %d\n", dev_err(&pdev->dev, "[%#x] Failed to enable power off sequence. %d\n",
pdev->usid, ret); pdev->usid, ret);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment