ASoC: PCM6240: Use of_property_read_reg()
PATCH 1/1 ASoC: PCM6240: Use of_property_read_reg()
Replace the open-coded parsing of "reg" with of_property_read_reg(). The #ifdef is also easily replaced with IS_ENABLED().
--- sound/soc/codecs/pcm6240.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
sound/soc/codecs/pcm6240.c +10 -21
@@ -18,6 +18,7 @@#include <linux/i2c.h> #include <linux/module.h> #include <linux/of_irq.h> +#include <linux/of_address.h> #include <linux/regmap.h> #include <sound/pcm_params.h> #include <sound/soc.h>
@@ -2081,10 +2082,6 @@ static int pcmdevice_i2c_probe(struct i2c_client *i2c)struct device_node *np;unsigned int dev_addrs[PCMDEVICE_MAX_I2C_DEVICES ];int ret =0 , i =0 , ndev =0 ; -#ifdef CONFIG_OF -const __be32 *reg, *reg_end; -int len, sw, aw; -#endif pcm_dev =devm_kzalloc (&i2c->dev,sizeof (*pcm_dev),GFP_KERNEL );if (!pcm_dev) {
@@ -2120,27 +2117,19 @@ static int pcmdevice_i2c_probe(struct i2c_client *i2c)i2c_set_clientdata (i2c, pcm_dev);mutex_init (&pcm_dev->codec_lock); np = pcm_dev->dev->of_node; -#ifdef CONFIG_OF - aw =of_n_addr_cells (np); - sw =of_n_size_cells (np); -if (sw ==0 ) { - reg = (const __be32 *)of_get_property (np, -"reg" , &len); - reg_end = reg + len/sizeof (*reg); - ndev =0 ; -do { - dev_addrs[ndev] =of_read_number (reg, aw); - reg += aw; - ndev++; - }while (reg < reg_end); + +if (IS_ENABLED (CONFIG_OF )) { +u64 addr; + +for (i =0 ; i <PCMDEVICE_MAX_I2C_DEVICES ; i++) { +if (of_property_read_reg (np, i, &addr,NULL )) +break ; + dev_addrs[ndev++] = addr; + } }else { ndev =1 ; dev_addrs[0 ] = i2c->addr; } -#else - ndev =1 ; - dev_addrs[0 ] = i2c->addr; -#endif pcm_dev->irq_info.gpio =of_irq_get (np,0 );for (i =0 ; i < ndev; i++)
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 4 lines · Rob Herring (Arm)
Replace the open-coded parsing of "reg" with
of_property_read_reg(). The #ifdef is also easily replaced withIS_ENABLED().
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: PCM6240: Use of_property_read_reg()
commit: 4aad1d9471108a5023e224422b2522323521174c
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