Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1342881
| From | Axel Lin <axel.lin@ingics.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/3] regulator: max77620: Eliminate duplicate code |
| Date | 2016-02-25 07:50 +0100 |
| Message-ID | <r5XUm-8jN-11@gated-at.bofh.it> (permalink) |
| References | <r5XKG-8ej-15@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/max77620-regulator.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 761eb96..0eb5d18 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -264,15 +264,15 @@ static int max77620_read_slew_rate(struct max77620_regulator *pmic, int id)
int slew_rate;
int ret;
+ ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
+ if (ret < 0) {
+ dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
+ rinfo->cfg_addr, ret);
+ return ret;
+ }
+
switch (rinfo->type) {
case MAX77620_REGULATOR_TYPE_SD:
- ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
- if (ret < 0) {
- dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
- rinfo->cfg_addr, ret);
- return ret;
- }
-
slew_rate = (rval >> MAX77620_SD_SR_SHIFT) & 0x3;
switch (slew_rate) {
case 0:
@@ -291,12 +291,6 @@ static int max77620_read_slew_rate(struct max77620_regulator *pmic, int id)
rinfo->desc.ramp_delay = slew_rate;
break;
default:
- ret = regmap_read(pmic->rmap, rinfo->cfg_addr, &rval);
- if (ret < 0) {
- dev_err(pmic->dev, "Register 0x%02x read failed: %d\n",
- rinfo->cfg_addr, ret);
- return ret;
- }
slew_rate = rval & 0x1;
switch (slew_rate) {
case 0:
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 1/3] regulator: max77620: Remove unused fields Axel Lin <axel.lin@ingics.com> - 2016-02-25 07:40 +0100 [PATCH 3/3] regulator: max77620: Remove duplicate module alias Axel Lin <axel.lin@ingics.com> - 2016-02-25 07:50 +0100 [PATCH 2/3] regulator: max77620: Eliminate duplicate code Axel Lin <axel.lin@ingics.com> - 2016-02-25 07:50 +0100
csiph-web