[PATCH] regmap: mmio: Fix rebase error

[PATCH] regmap: mmio: Fix rebase error

[Linus Walleij]

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>
---
 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 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;
 }
 
 
-- 
2.37.2

Re: [PATCH] regmap: mmio: Fix rebase error

[Andy Shevchenko]

On Wed, Aug 31, 2022 at 04:13:03PM +0200, Linus Walleij wrote:
> A dangling pointless "ret 0" was left in and some unneeded
> whitespace can go too.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> 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>
> ---
>  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 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;
>  }
>  
>  
> -- 
> 2.37.2
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] regmap: mmio: Fix rebase error

[Mark Brown]

On Wed, 31 Aug 2022 16:13:03 +0200, Linus Walleij wrote:
> A dangling pointless "ret 0" was left in and some unneeded
> whitespace can go too.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: mmio: Fix rebase error
      commit: d57f2035c0455dfd5e4d29caa0266fad6febe6d6

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark