ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value

PATCH Applied Axel Lin 4 participants 4 messages Oct 20, 2011 – Oct 21, 2011

Subsystems (3)

Sound ASoC NXP SGTL5000 driver

lore

Share & tools

lore

Axel Lin

author

2011-10-20 10:49 UTC #0 lore raw

PATCH 1/1 ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value

We have defined SGTL5000_LINREG_VDDD_MASK in sgtl5000.h, use it instead of hardcoded (0x1 << 4) - 1 for the mask.

Signed-off-by Axel Lin <[email protected]>

---
 sound/soc/codecs/sgtl5000.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

sound/soc/codecs/sgtl5000.c +3 -3

index 8395002..32b5bbd 100644
@@ -754,7 +754,7 @@ static int ldo_regulator_enable(struct regulator_dev *dev)
 
 	/* set voltage to register */
 	snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL,
-				(0x1 << 4) - 1, reg);
+				SGTL5000_LINREG_VDDD_MASK, reg);
 
 	snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
 				SGTL5000_LINEREG_D_POWERUP,

@@ -780,7 +780,7 @@ static int ldo_regulator_disable(struct regulator_dev *dev)
 
 	/* clear voltage info */
 	snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL,
-				(0x1 << 4) - 1, 0);
+				SGTL5000_LINREG_VDDD_MASK, 0);
 
 	ldo->enabled = 0;

@@ -1115,7 +1115,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
 
 	/* set voltage to register */
 	snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL,
-				(0x1 << 4) - 1, 0x8);
+				SGTL5000_LINREG_VDDD_MASK, 0x8);
 
 	/*
 	 * if vddd linear reg has been enabled,

Signature · 1 line

1.7.5.4

Wolfram Sang

Acked-by on v1 1/1

2011-10-20 11:02 UTC #1 lore raw

Quoted 4 lines · Axel Lin

We have defined SGTL5000_LINREG_VDDD_MASK in sgtl5000.h, use it instead of hardcoded (0x1 << 4) - 1 for the mask.
Signed-off-by Axel Lin <[email protected]>

Acked-by Wolfram Sang <[email protected]>

Signature · 2 lines

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Girdwood, Liam

Acked-by

2011-10-20 16:54 UTC #2 lore raw

Quoted 8 lines · Wolfram Sang

Quoted 4 lines · Axel Lin
We have defined SGTL5000_LINREG_VDDD_MASK in sgtl5000.h, use it instead of hardcoded (0x1 << 4) - 1 for the mask.
Signed-off-by Axel Lin <[email protected]>
Acked-by Wolfram Sang <[email protected]>

Acked-by Liam Girdwood <[email protected]>

Mark Brown

Applied

2011-10-21 08:56 UTC #3 lore raw

In reply to Axel Lin

Quoted 2 lines · Axel Lin

We have defined SGTL5000_LINREG_VDDD_MASK in sgtl5000.h, use it instead of hardcoded (0x1 << 4) - 1 for the mask.

Applied, thanks.