Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / codecs / max9850.c

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index 481d58f1cb3f6b543b5e0fa320dd39103c992bd8..0610840733d1629d7fdd12f3dcdcf023681b3c42 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -67,13 +67,12 @@ static const struct regmap_config max9850_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static const unsigned int max9850_tlv[] = {
-       TLV_DB_RANGE_HEAD(4),
+static const DECLARE_TLV_DB_RANGE(max9850_tlv,
        0x18, 0x1f, TLV_DB_SCALE_ITEM(-7450, 400, 0),
        0x20, 0x33, TLV_DB_SCALE_ITEM(-4150, 200, 0),
        0x34, 0x37, TLV_DB_SCALE_ITEM(-150, 100, 0),
-       0x38, 0x3f, TLV_DB_SCALE_ITEM(250, 50, 0),
-};
+       0x38, 0x3f, TLV_DB_SCALE_ITEM(250, 50, 0)
+);
 
 static const struct snd_kcontrol_new max9850_controls[] = {
 SOC_SINGLE_TLV("Headphone Volume", MAX9850_VOLUME, 0, 0x3f, 1, max9850_tlv),
@@ -307,12 +306,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = {
        .set_bias_level = max9850_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = max9850_controls,
-       .num_controls = ARRAY_SIZE(max9850_controls),
-       .dapm_widgets = max9850_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max9850_dapm_widgets),
-       .dapm_routes = max9850_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes),
+       .component_driver = {
+               .controls               = max9850_controls,
+               .num_controls           = ARRAY_SIZE(max9850_controls),
+               .dapm_widgets           = max9850_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max9850_dapm_widgets),
+               .dapm_routes            = max9850_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(max9850_dapm_routes),
+       },
 };
 
 static int max9850_i2c_probe(struct i2c_client *i2c,
@@ -352,7 +353,6 @@ MODULE_DEVICE_TABLE(i2c, max9850_i2c_id);
 static struct i2c_driver max9850_i2c_driver = {
        .driver = {
                .name = "max9850",
-               .owner = THIS_MODULE,
        },
        .probe = max9850_i2c_probe,
        .remove = max9850_i2c_remove,