lkml.org 
[lkml]   [2014]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mfd: da9052: Avoid setting read_flag_mask for da9052-i2c driver
On Sat, 16 Aug 2014, Axel Lin wrote:

> Current code init regmap with &da9052_regmap_config for both da9052-spi and
> da9052-i2c drivers. da9052-spi sets the read_flag_mask.
> The same setting may be applied for da9052-i2c if da9052-spi driver is loaded
> first because they actually use the same regmap_config setting.
> Fix this issue by using a local variable for regmap_config in da9052-spi driver,
> so the settings in spi driver won't impact the settings in i2c driver.
> Also makes da9052_regmap_config const to avoid similar issue.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> Hi Adam and Steve,

Applied with Adam's Ack.

> Any chance to test this patch?
>
> Thanks,
> Axel
> drivers/mfd/da9052-core.c | 2 +-
> drivers/mfd/da9052-spi.c | 7 ++++---
> include/linux/mfd/da9052/da9052.h | 2 +-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
> index e8af816..52a0c2f 100644
> --- a/drivers/mfd/da9052-core.c
> +++ b/drivers/mfd/da9052-core.c
> @@ -522,7 +522,7 @@ static const struct mfd_cell da9052_subdev_info[] = {
> },
> };
>
> -struct regmap_config da9052_regmap_config = {
> +const struct regmap_config da9052_regmap_config = {
> .reg_bits = 8,
> .val_bits = 8,
>
> diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
> index 17666b4..45ae0b7 100644
> --- a/drivers/mfd/da9052-spi.c
> +++ b/drivers/mfd/da9052-spi.c
> @@ -23,6 +23,7 @@
>
> static int da9052_spi_probe(struct spi_device *spi)
> {
> + struct regmap_config config;
> int ret;
> const struct spi_device_id *id = spi_get_device_id(spi);
> struct da9052 *da9052;
> @@ -40,10 +41,10 @@ static int da9052_spi_probe(struct spi_device *spi)
>
> spi_set_drvdata(spi, da9052);
>
> - da9052_regmap_config.read_flag_mask = 1;
> - da9052_regmap_config.write_flag_mask = 0;
> + config = da9052_regmap_config;
> + config.read_flag_mask = 1;
>
> - da9052->regmap = devm_regmap_init_spi(spi, &da9052_regmap_config);
> + da9052->regmap = devm_regmap_init_spi(spi, &config);
> if (IS_ERR(da9052->regmap)) {
> ret = PTR_ERR(da9052->regmap);
> dev_err(&spi->dev, "Failed to allocate register map: %d\n",
> diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h
> index bba65f5..c18a4c1 100644
> --- a/include/linux/mfd/da9052/da9052.h
> +++ b/include/linux/mfd/da9052/da9052.h
> @@ -211,7 +211,7 @@ static inline int da9052_reg_update(struct da9052 *da9052, unsigned char reg,
> int da9052_device_init(struct da9052 *da9052, u8 chip_id);
> void da9052_device_exit(struct da9052 *da9052);
>
> -extern struct regmap_config da9052_regmap_config;
> +extern const struct regmap_config da9052_regmap_config;
>
> int da9052_irq_init(struct da9052 *da9052);
> int da9052_irq_exit(struct da9052 *da9052);

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2014-09-04 11:21    [W:0.068 / U:1.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site