From d57f2035c0455dfd5e4d29caa0266fad6febe6d6 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 31 Aug 2022 16:13:03 +0200 Subject: [PATCH] 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 Signed-off-by: Linus Walleij Link: https://lore.kernel.org/r/20220831141303.501548-1-linus.walleij@linaro.org Signed-off-by: Mark Brown --- drivers/base/regmap/regmap-mmio.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index e8d2675..b47ee3e 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; } -- 2.7.4