Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc...

[linux-2.6-block.git] / sound / soc / codecs / max9867.c

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 2a22fddeb6afa02dbfb26b452cd4fd0f91b4024d..42e2e407e287c4dc0354a00d864e8b997fcacbfa 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -38,11 +38,10 @@ static DECLARE_TLV_DB_SCALE(max9860_capture_tlv, -600, 200, 0);
 static DECLARE_TLV_DB_SCALE(max9860_mic_tlv, 2000, 100, 1);
 static DECLARE_TLV_DB_SCALE(max9860_adc_left_tlv, -1200, 100, 1);
 static DECLARE_TLV_DB_SCALE(max9860_adc_right_tlv, -1200, 100, 1);
-static const unsigned int max98088_micboost_tlv[] = {
-       TLV_DB_RANGE_HEAD(2),
+static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max98088_micboost_tlv,
        0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0),
        2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),
-};
+);
 
 static const struct snd_kcontrol_new max9867_snd_controls[] = {
        SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL,
@@ -417,12 +416,14 @@ static int max9867_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver max9867_codec = {
        .probe = max9867_probe,
-       .controls = max9867_snd_controls,
-       .num_controls = ARRAY_SIZE(max9867_snd_controls),
-       .dapm_routes = max9867_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(max9867_audio_map),
-       .dapm_widgets = max9867_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets),
+       .component_driver = {
+               .controls               = max9867_snd_controls,
+               .num_controls           = ARRAY_SIZE(max9867_snd_controls),
+               .dapm_routes            = max9867_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(max9867_audio_map),
+               .dapm_widgets           = max9867_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max9867_dapm_widgets),
+       },
 };
 
 static bool max9867_volatile_register(struct device *dev, unsigned int reg)