summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2022-08-31 16:13:03 +0200
committerMark Brown <broonie@kernel.org>2022-09-01 11:56:26 +0100
commitd57f2035c0455dfd5e4d29caa0266fad6febe6d6 (patch)
tree57bb221f82447ac701edd9d2801847a263dfdeec
parentb7059927c3e32c96d2ff50c206549d8fac0ba69e (diff)
downloadlinux-stable-d57f2035c0455dfd5e4d29caa0266fad6febe6d6.tar.gz
linux-stable-d57f2035c0455dfd5e4d29caa0266fad6febe6d6.tar.bz2
linux-stable-d57f2035c0455dfd5e4d29caa0266fad6febe6d6.zip
regmap: mmio: Fix rebase error
A dangling pointless "ret 0" was left in and some unneeded whitespace can go too. Fixes: 81c0386c1376 ("regmap: mmio: Support accelerared noinc operations") Reported-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20220831141303.501548-1-linus.walleij@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/base/regmap/regmap-mmio.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index e8d2675463ac..b47ee3e8d050 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -410,14 +410,11 @@ static int regmap_mmio_noinc_read(void *context, unsigned int reg,
}
}
-
out_clk:
if (!IS_ERR(ctx->clk))
clk_disable(ctx->clk);
return ret;
-
- return 0;
}