diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-11-20 11:21:34 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-16 04:02:19 -0400 |
commit | 093eef416642c84265cced12335ff125f0db7313 (patch) | |
tree | 1eb086a48f03a84022a59107dbd81a2d380bb1c7 | |
parent | bf1d1c9b6179faa3bc32cee882462bc8eebde25d (diff) |
ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
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>
-rw-r--r-- | sound/pci/es1938.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 82c8d8c5c52a..a41106d745ca 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -1321,35 +1321,30 @@ static int snd_es1938_put_double(struct snd_kcontrol *kcontrol, | |||
1321 | return change; | 1321 | return change; |
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | static unsigned int db_scale_master[] = { | 1324 | static const DECLARE_TLV_DB_RANGE(db_scale_master, |
1325 | TLV_DB_RANGE_HEAD(2), | ||
1326 | 0, 54, TLV_DB_SCALE_ITEM(-3600, 50, 1), | 1325 | 0, 54, TLV_DB_SCALE_ITEM(-3600, 50, 1), |
1327 | 54, 63, TLV_DB_SCALE_ITEM(-900, 100, 0), | 1326 | 54, 63, TLV_DB_SCALE_ITEM(-900, 100, 0), |
1328 | }; | 1327 | ); |
1329 | 1328 | ||
1330 | static unsigned int db_scale_audio1[] = { | 1329 | static const DECLARE_TLV_DB_RANGE(db_scale_audio1, |
1331 | TLV_DB_RANGE_HEAD(2), | ||
1332 | 0, 8, TLV_DB_SCALE_ITEM(-3300, 300, 1), | 1330 | 0, 8, TLV_DB_SCALE_ITEM(-3300, 300, 1), |
1333 | 8, 15, TLV_DB_SCALE_ITEM(-900, 150, 0), | 1331 | 8, 15, TLV_DB_SCALE_ITEM(-900, 150, 0), |
1334 | }; | 1332 | ); |
1335 | 1333 | ||
1336 | static unsigned int db_scale_audio2[] = { | 1334 | static const DECLARE_TLV_DB_RANGE(db_scale_audio2, |
1337 | TLV_DB_RANGE_HEAD(2), | ||
1338 | 0, 8, TLV_DB_SCALE_ITEM(-3450, 300, 1), | 1335 | 0, 8, TLV_DB_SCALE_ITEM(-3450, 300, 1), |
1339 | 8, 15, TLV_DB_SCALE_ITEM(-1050, 150, 0), | 1336 | 8, 15, TLV_DB_SCALE_ITEM(-1050, 150, 0), |
1340 | }; | 1337 | ); |
1341 | 1338 | ||
1342 | static unsigned int db_scale_mic[] = { | 1339 | static const DECLARE_TLV_DB_RANGE(db_scale_mic, |
1343 | TLV_DB_RANGE_HEAD(2), | ||
1344 | 0, 8, TLV_DB_SCALE_ITEM(-2400, 300, 1), | 1340 | 0, 8, TLV_DB_SCALE_ITEM(-2400, 300, 1), |
1345 | 8, 15, TLV_DB_SCALE_ITEM(0, 150, 0), | 1341 | 8, 15, TLV_DB_SCALE_ITEM(0, 150, 0), |
1346 | }; | 1342 | ); |
1347 | 1343 | ||
1348 | static unsigned int db_scale_line[] = { | 1344 | static const DECLARE_TLV_DB_RANGE(db_scale_line, |
1349 | TLV_DB_RANGE_HEAD(2), | ||
1350 | 0, 8, TLV_DB_SCALE_ITEM(-3150, 300, 1), | 1345 | 0, 8, TLV_DB_SCALE_ITEM(-3150, 300, 1), |
1351 | 8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0), | 1346 | 8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0), |
1352 | }; | 1347 | ); |
1353 | 1348 | ||
1354 | static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0); | 1349 | static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0); |
1355 | 1350 | ||