iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE

Browse Source 
Instead of the hard-to-mantain TLV_DB_RANGE_HEAD macro, use
DECLARE_TLV_DB_RANGE, which computes its size automatically.

(Also make this data const on the way.)

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2011-11-20 17:21:34 +01:00 committed by Takashi Iwai
parent bf1d1c9b61
commit 093eef4166
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/pci/es1938.c
View File

@ -1321,35 +1321,30 @@ static int snd_es1938_put_double(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static unsigned int db_scale_master[] = { static const DECLARE_TLV_DB_RANGE(db_scale_master,
TLV_DB_RANGE_HEAD(2),
0, 54, TLV_DB_SCALE_ITEM(-3600, 50, 1), 0, 54, TLV_DB_SCALE_ITEM(-3600, 50, 1),
54, 63, TLV_DB_SCALE_ITEM(-900, 100, 0), 54, 63, TLV_DB_SCALE_ITEM(-900, 100, 0),
}; );
static unsigned int db_scale_audio1[] = { static const DECLARE_TLV_DB_RANGE(db_scale_audio1,
TLV_DB_RANGE_HEAD(2),
0, 8, TLV_DB_SCALE_ITEM(-3300, 300, 1), 0, 8, TLV_DB_SCALE_ITEM(-3300, 300, 1),
8, 15, TLV_DB_SCALE_ITEM(-900, 150, 0), 8, 15, TLV_DB_SCALE_ITEM(-900, 150, 0),
}; );
static unsigned int db_scale_audio2[] = { static const DECLARE_TLV_DB_RANGE(db_scale_audio2,
TLV_DB_RANGE_HEAD(2),
0, 8, TLV_DB_SCALE_ITEM(-3450, 300, 1), 0, 8, TLV_DB_SCALE_ITEM(-3450, 300, 1),
8, 15, TLV_DB_SCALE_ITEM(-1050, 150, 0), 8, 15, TLV_DB_SCALE_ITEM(-1050, 150, 0),
}; );
static unsigned int db_scale_mic[] = { static const DECLARE_TLV_DB_RANGE(db_scale_mic,
TLV_DB_RANGE_HEAD(2),
0, 8, TLV_DB_SCALE_ITEM(-2400, 300, 1), 0, 8, TLV_DB_SCALE_ITEM(-2400, 300, 1),
8, 15, TLV_DB_SCALE_ITEM(0, 150, 0), 8, 15, TLV_DB_SCALE_ITEM(0, 150, 0),
}; );
static unsigned int db_scale_line[] = { static const DECLARE_TLV_DB_RANGE(db_scale_line,
TLV_DB_RANGE_HEAD(2),
0, 8, TLV_DB_SCALE_ITEM(-3150, 300, 1), 0, 8, TLV_DB_SCALE_ITEM(-3150, 300, 1),
8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0), 8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0),
}; );
static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0); static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0);