| Message ID | 1438528810-23498-29-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2524911e300771954698f384bd7f44543b2af2de |
| Headers | show |
On 08/02/2015 06:19 PM, Lars-Peter Clausen wrote: > DECLARE_TLV_DB_RANGE() has the advantage over using TLV_DB_RANGE_HEAD() > that it automatically calculates the number of items in the TLV and is > hence less prone to manual error. > > Generate using the following coccinelle script > > // <smpl> > @@ > declarer name DECLARE_TLV_DB_RANGE; > identifier tlv; > constant x; > @@ > -unsigned int tlv[] = { > - TLV_DB_RANGE_HEAD(x), > +DECLARE_TLV_DB_RANGE(tlv, > ... > -}; > +); > // </smpl> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > sound/soc/codecs/twl4030.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c > index 90f5f04..2713e18 100644 > --- a/sound/soc/codecs/twl4030.c > +++ b/sound/soc/codecs/twl4030.c > @@ -524,12 +524,11 @@ static const struct snd_kcontrol_new twl4030_dapm_abypassv_control = > SOC_DAPM_SINGLE("Switch", TWL4030_REG_VDL_APGA_CTL, 2, 1, 0); > > /* Digital bypass gain, mute instead of -30dB */ > -static const unsigned int twl4030_dapm_dbypass_tlv[] = { > - TLV_DB_RANGE_HEAD(3), > +static const DECLARE_TLV_DB_RANGE(twl4030_dapm_dbypass_tlv, > 0, 1, TLV_DB_SCALE_ITEM(-3000, 600, 1), > 2, 3, TLV_DB_SCALE_ITEM(-2400, 0, 0), > - 4, 7, TLV_DB_SCALE_ITEM(-1800, 600, 0), > -}; > + 4, 7, TLV_DB_SCALE_ITEM(-1800, 600, 0) > +); > > /* Digital bypass left (TX1L -> RX2L) */ > static const struct snd_kcontrol_new twl4030_dapm_dbypassl_control = >
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 90f5f04..2713e18 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -524,12 +524,11 @@ static const struct snd_kcontrol_new twl4030_dapm_abypassv_control = SOC_DAPM_SINGLE("Switch", TWL4030_REG_VDL_APGA_CTL, 2, 1, 0); /* Digital bypass gain, mute instead of -30dB */ -static const unsigned int twl4030_dapm_dbypass_tlv[] = { - TLV_DB_RANGE_HEAD(3), +static const DECLARE_TLV_DB_RANGE(twl4030_dapm_dbypass_tlv, 0, 1, TLV_DB_SCALE_ITEM(-3000, 600, 1), 2, 3, TLV_DB_SCALE_ITEM(-2400, 0, 0), - 4, 7, TLV_DB_SCALE_ITEM(-1800, 600, 0), -}; + 4, 7, TLV_DB_SCALE_ITEM(-1800, 600, 0) +); /* Digital bypass left (TX1L -> RX2L) */ static const struct snd_kcontrol_new twl4030_dapm_dbypassl_control =
DECLARE_TLV_DB_RANGE() has the advantage over using TLV_DB_RANGE_HEAD() that it automatically calculates the number of items in the TLV and is hence less prone to manual error. Generate using the following coccinelle script // <smpl> @@ declarer name DECLARE_TLV_DB_RANGE; identifier tlv; constant x; @@ -unsigned int tlv[] = { - TLV_DB_RANGE_HEAD(x), +DECLARE_TLV_DB_RANGE(tlv, ... -}; +); // </smpl> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/codecs/twl4030.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)