Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc...

[pandora-kernel.git] / sound / soc / codecs / uda1380.c

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 6e159f5..35f0469 100644 (file)
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -269,12 +269,11 @@ static DECLARE_TLV_DB_SCALE(amix_tlv, -4950, 150, 1);
  * from -66 dB in 0.5 dB steps (2 dB steps, really) and
  * from -52 dB in 0.25 dB steps
  */
-static const unsigned int mvol_tlv[] = {
-       TLV_DB_RANGE_HEAD(3),
+static const DECLARE_TLV_DB_RANGE(mvol_tlv,
        0, 15, TLV_DB_SCALE_ITEM(-8200, 100, 1),
        16, 43, TLV_DB_SCALE_ITEM(-6600, 50, 0),
-       44, 252, TLV_DB_SCALE_ITEM(-5200, 25, 0),
-};
+       44, 252, TLV_DB_SCALE_ITEM(-5200, 25, 0)
+);
 
 /*
  * from -72 dB in 1.5 dB steps (6 dB steps really),
@@ -282,13 +281,12 @@ static const unsigned int mvol_tlv[] = {
  * from -60 dB in 0.5 dB steps (2 dB steps really) and
  * from -46 dB in 0.25 dB steps
  */
-static const unsigned int vc_tlv[] = {
-       TLV_DB_RANGE_HEAD(4),
+static const DECLARE_TLV_DB_RANGE(vc_tlv,
        0, 7, TLV_DB_SCALE_ITEM(-7800, 150, 1),
        8, 15, TLV_DB_SCALE_ITEM(-6600, 75, 0),
        16, 43, TLV_DB_SCALE_ITEM(-6000, 50, 0),
-       44, 228, TLV_DB_SCALE_ITEM(-4600, 25, 0),
-};
+       44, 228, TLV_DB_SCALE_ITEM(-4600, 25, 0)
+);
 
 /* from 0 to 6 dB in 2 dB steps if SPF mode != flat */
 static DECLARE_TLV_DB_SCALE(tr_tlv, 0, 200, 0);
@@ -810,7 +808,6 @@ MODULE_DEVICE_TABLE(i2c, uda1380_i2c_id);
 static struct i2c_driver uda1380_i2c_driver = {
        .driver = {
                .name =  "uda1380-codec",
-               .owner = THIS_MODULE,
        },
        .probe =    uda1380_i2c_probe,
        .remove =   uda1380_i2c_remove,