Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1321660

Re: [PATCH] mfd: syscon: make syscon_regmap_config const

Show all headers | View raw

On Fri, 29 Jan 2016, Philipp Zabel wrote:

> syscon_regmap_config can be made const if syscon_probe() creates a local
> copy on the stack, just like syscon_register() does.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  drivers/mfd/syscon.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
> index b7aabee..b730071 100644
> --- a/drivers/mfd/syscon.c
> +++ b/drivers/mfd/syscon.c
> @@ -36,7 +36,7 @@ struct syscon {
>  	struct list_head list;
>  };
>  
> -static struct regmap_config syscon_regmap_config = {
> +static const struct regmap_config syscon_regmap_config = {
>  	.reg_bits = 32,
>  	.val_bits = 32,
>  	.reg_stride = 4,
> @@ -192,6 +192,7 @@ static int syscon_probe(struct platform_device *pdev)
>  	struct device *dev = &pdev->dev;
>  	struct syscon_platform_data *pdata = dev_get_platdata(dev);
>  	struct syscon *syscon;
> +	struct regmap_config syscon_config = syscon_regmap_config;
>  	struct resource *res;
>  	void __iomem *base;
>  
> @@ -207,11 +208,10 @@ static int syscon_probe(struct platform_device *pdev)
>  	if (!base)
>  		return -ENOMEM;
>  
> -	syscon_regmap_config.max_register = res->end - res->start - 3;
> +	syscon_config.max_register = res->end - res->start - 3;
>  	if (pdata)
> -		syscon_regmap_config.name = pdata->label;
> -	syscon->regmap = devm_regmap_init_mmio(dev, base,
> -					&syscon_regmap_config);
> +		syscon_config.name = pdata->label;
> +	syscon->regmap = devm_regmap_init_mmio(dev, base, &syscon_config);
>  	if (IS_ERR(syscon->regmap)) {
>  		dev_err(dev, "regmap init failed\n");
>  		return PTR_ERR(syscon->regmap);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] mfd: syscon: make syscon_regmap_config const Philipp Zabel <p.zabel@pengutronix.de> - 2016-01-29 10:40 +0100
  Re: [PATCH] mfd: syscon: make syscon_regmap_config const Lee Jones <lee.jones@linaro.org> - 2016-01-29 12:20 +0100

csiph-web