diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-05-18 12:02:04 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 04:11:20 -0400 |
commit | 123992f728785e05f385d23893bd5ec69871aeb4 (patch) | |
tree | 0f731b0f807903a4a5add6b0ff7ab5a9737c02ae /sound | |
parent | 5218064c885af5c49e380d09d54f3cc86891a580 (diff) |
[ALSA] sound/core/: possible cleanups
PCM Midlevel,ALSA Core,Timer Midlevel,ALSA sequencer,Virtual Midi
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global functions
- remove the following unneeded EXPORT_SYMBOL's
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/pcm.c | 1 | ||||
-rw-r--r-- | sound/core/pcm_lib.c | 52 | ||||
-rw-r--r-- | sound/core/pcm_native.c | 4 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_event.c | 6 | ||||
-rw-r--r-- | sound/core/seq/seq_queue.c | 3 | ||||
-rw-r--r-- | sound/core/seq/seq_queue.h | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_timer.c | 3 | ||||
-rw-r--r-- | sound/core/seq/seq_timer.h | 2 | ||||
-rw-r--r-- | sound/core/seq/seq_virmidi.c | 4 | ||||
-rw-r--r-- | sound/core/sound.c | 1 | ||||
-rw-r--r-- | sound/core/timer.c | 8 |
11 files changed, 42 insertions, 43 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index d57f4ec3b08b..9f4c9209b271 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
@@ -1049,7 +1049,6 @@ EXPORT_SYMBOL(snd_pcm_release_substream); | |||
1049 | EXPORT_SYMBOL(snd_pcm_format_name); | 1049 | EXPORT_SYMBOL(snd_pcm_format_name); |
1050 | /* pcm_native.c */ | 1050 | /* pcm_native.c */ |
1051 | EXPORT_SYMBOL(snd_pcm_link_rwlock); | 1051 | EXPORT_SYMBOL(snd_pcm_link_rwlock); |
1052 | EXPORT_SYMBOL(snd_pcm_start); | ||
1053 | #ifdef CONFIG_PM | 1052 | #ifdef CONFIG_PM |
1054 | EXPORT_SYMBOL(snd_pcm_suspend); | 1053 | EXPORT_SYMBOL(snd_pcm_suspend); |
1055 | EXPORT_SYMBOL(snd_pcm_suspend_all); | 1054 | EXPORT_SYMBOL(snd_pcm_suspend_all); |
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 151fd99ca2c9..7ce8b2164f6c 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c | |||
@@ -1143,7 +1143,8 @@ int snd_pcm_hw_constraint_pow2(snd_pcm_runtime_t *runtime, | |||
1143 | #define INT_MIN ((int)((unsigned int)INT_MAX+1)) | 1143 | #define INT_MIN ((int)((unsigned int)INT_MAX+1)) |
1144 | #endif | 1144 | #endif |
1145 | 1145 | ||
1146 | void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var) | 1146 | static void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, |
1147 | snd_pcm_hw_param_t var) | ||
1147 | { | 1148 | { |
1148 | if (hw_is_mask(var)) { | 1149 | if (hw_is_mask(var)) { |
1149 | snd_mask_any(hw_param_mask(params, var)); | 1150 | snd_mask_any(hw_param_mask(params, var)); |
@@ -1163,12 +1164,14 @@ void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var) | |||
1163 | /** | 1164 | /** |
1164 | * snd_pcm_hw_param_any | 1165 | * snd_pcm_hw_param_any |
1165 | */ | 1166 | */ |
1167 | #if 0 | ||
1166 | int snd_pcm_hw_param_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | 1168 | int snd_pcm_hw_param_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, |
1167 | snd_pcm_hw_param_t var) | 1169 | snd_pcm_hw_param_t var) |
1168 | { | 1170 | { |
1169 | _snd_pcm_hw_param_any(params, var); | 1171 | _snd_pcm_hw_param_any(params, var); |
1170 | return snd_pcm_hw_refine(pcm, params); | 1172 | return snd_pcm_hw_refine(pcm, params); |
1171 | } | 1173 | } |
1174 | #endif /* 0 */ | ||
1172 | 1175 | ||
1173 | void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params) | 1176 | void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params) |
1174 | { | 1177 | { |
@@ -1186,11 +1189,13 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params) | |||
1186 | * | 1189 | * |
1187 | * Fill PARAMS with full configuration space boundaries | 1190 | * Fill PARAMS with full configuration space boundaries |
1188 | */ | 1191 | */ |
1192 | #if 0 | ||
1189 | int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) | 1193 | int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) |
1190 | { | 1194 | { |
1191 | _snd_pcm_hw_params_any(params); | 1195 | _snd_pcm_hw_params_any(params); |
1192 | return snd_pcm_hw_refine(pcm, params); | 1196 | return snd_pcm_hw_refine(pcm, params); |
1193 | } | 1197 | } |
1198 | #endif /* 0 */ | ||
1194 | 1199 | ||
1195 | /** | 1200 | /** |
1196 | * snd_pcm_hw_param_value | 1201 | * snd_pcm_hw_param_value |
@@ -1198,8 +1203,8 @@ int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) | |||
1198 | * Return the value for field PAR if it's fixed in configuration space | 1203 | * Return the value for field PAR if it's fixed in configuration space |
1199 | * defined by PARAMS. Return -EINVAL otherwise | 1204 | * defined by PARAMS. Return -EINVAL otherwise |
1200 | */ | 1205 | */ |
1201 | int snd_pcm_hw_param_value(const snd_pcm_hw_params_t *params, | 1206 | static int snd_pcm_hw_param_value(const snd_pcm_hw_params_t *params, |
1202 | snd_pcm_hw_param_t var, int *dir) | 1207 | snd_pcm_hw_param_t var, int *dir) |
1203 | { | 1208 | { |
1204 | if (hw_is_mask(var)) { | 1209 | if (hw_is_mask(var)) { |
1205 | const snd_mask_t *mask = hw_param_mask_c(params, var); | 1210 | const snd_mask_t *mask = hw_param_mask_c(params, var); |
@@ -1303,6 +1308,7 @@ int _snd_pcm_hw_param_setinteger(snd_pcm_hw_params_t *params, | |||
1303 | * non integer values. Reduce configuration space accordingly. | 1308 | * non integer values. Reduce configuration space accordingly. |
1304 | * Return -EINVAL if the configuration space is empty | 1309 | * Return -EINVAL if the configuration space is empty |
1305 | */ | 1310 | */ |
1311 | #if 0 | ||
1306 | int snd_pcm_hw_param_setinteger(snd_pcm_t *pcm, | 1312 | int snd_pcm_hw_param_setinteger(snd_pcm_t *pcm, |
1307 | snd_pcm_hw_params_t *params, | 1313 | snd_pcm_hw_params_t *params, |
1308 | snd_pcm_hw_param_t var) | 1314 | snd_pcm_hw_param_t var) |
@@ -1317,9 +1323,10 @@ int snd_pcm_hw_param_setinteger(snd_pcm_t *pcm, | |||
1317 | } | 1323 | } |
1318 | return 0; | 1324 | return 0; |
1319 | } | 1325 | } |
1326 | #endif /* 0 */ | ||
1320 | 1327 | ||
1321 | int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params, | 1328 | static int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params, |
1322 | snd_pcm_hw_param_t var) | 1329 | snd_pcm_hw_param_t var) |
1323 | { | 1330 | { |
1324 | int changed; | 1331 | int changed; |
1325 | if (hw_is_mask(var)) | 1332 | if (hw_is_mask(var)) |
@@ -1345,9 +1352,9 @@ int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params, | |||
1345 | * values > minimum. Reduce configuration space accordingly. | 1352 | * values > minimum. Reduce configuration space accordingly. |
1346 | * Return the minimum. | 1353 | * Return the minimum. |
1347 | */ | 1354 | */ |
1348 | int snd_pcm_hw_param_first(snd_pcm_t *pcm, | 1355 | static int snd_pcm_hw_param_first(snd_pcm_t *pcm, |
1349 | snd_pcm_hw_params_t *params, | 1356 | snd_pcm_hw_params_t *params, |
1350 | snd_pcm_hw_param_t var, int *dir) | 1357 | snd_pcm_hw_param_t var, int *dir) |
1351 | { | 1358 | { |
1352 | int changed = _snd_pcm_hw_param_first(params, var); | 1359 | int changed = _snd_pcm_hw_param_first(params, var); |
1353 | if (changed < 0) | 1360 | if (changed < 0) |
@@ -1359,8 +1366,8 @@ int snd_pcm_hw_param_first(snd_pcm_t *pcm, | |||
1359 | return snd_pcm_hw_param_value(params, var, dir); | 1366 | return snd_pcm_hw_param_value(params, var, dir); |
1360 | } | 1367 | } |
1361 | 1368 | ||
1362 | int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params, | 1369 | static int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params, |
1363 | snd_pcm_hw_param_t var) | 1370 | snd_pcm_hw_param_t var) |
1364 | { | 1371 | { |
1365 | int changed; | 1372 | int changed; |
1366 | if (hw_is_mask(var)) | 1373 | if (hw_is_mask(var)) |
@@ -1386,9 +1393,9 @@ int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params, | |||
1386 | * values < maximum. Reduce configuration space accordingly. | 1393 | * values < maximum. Reduce configuration space accordingly. |
1387 | * Return the maximum. | 1394 | * Return the maximum. |
1388 | */ | 1395 | */ |
1389 | int snd_pcm_hw_param_last(snd_pcm_t *pcm, | 1396 | static int snd_pcm_hw_param_last(snd_pcm_t *pcm, |
1390 | snd_pcm_hw_params_t *params, | 1397 | snd_pcm_hw_params_t *params, |
1391 | snd_pcm_hw_param_t var, int *dir) | 1398 | snd_pcm_hw_param_t var, int *dir) |
1392 | { | 1399 | { |
1393 | int changed = _snd_pcm_hw_param_last(params, var); | 1400 | int changed = _snd_pcm_hw_param_last(params, var); |
1394 | if (changed < 0) | 1401 | if (changed < 0) |
@@ -1437,8 +1444,9 @@ int _snd_pcm_hw_param_min(snd_pcm_hw_params_t *params, | |||
1437 | * values < VAL. Reduce configuration space accordingly. | 1444 | * values < VAL. Reduce configuration space accordingly. |
1438 | * Return new minimum or -EINVAL if the configuration space is empty | 1445 | * Return new minimum or -EINVAL if the configuration space is empty |
1439 | */ | 1446 | */ |
1440 | int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | 1447 | static int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, |
1441 | snd_pcm_hw_param_t var, unsigned int val, int *dir) | 1448 | snd_pcm_hw_param_t var, unsigned int val, |
1449 | int *dir) | ||
1442 | { | 1450 | { |
1443 | int changed = _snd_pcm_hw_param_min(params, var, val, dir ? *dir : 0); | 1451 | int changed = _snd_pcm_hw_param_min(params, var, val, dir ? *dir : 0); |
1444 | if (changed < 0) | 1452 | if (changed < 0) |
@@ -1451,8 +1459,9 @@ int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | |||
1451 | return snd_pcm_hw_param_value_min(params, var, dir); | 1459 | return snd_pcm_hw_param_value_min(params, var, dir); |
1452 | } | 1460 | } |
1453 | 1461 | ||
1454 | int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params, | 1462 | static int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params, |
1455 | snd_pcm_hw_param_t var, unsigned int val, int dir) | 1463 | snd_pcm_hw_param_t var, unsigned int val, |
1464 | int dir) | ||
1456 | { | 1465 | { |
1457 | int changed; | 1466 | int changed; |
1458 | int open = 0; | 1467 | int open = 0; |
@@ -1490,8 +1499,9 @@ int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params, | |||
1490 | * values >= VAL + 1. Reduce configuration space accordingly. | 1499 | * values >= VAL + 1. Reduce configuration space accordingly. |
1491 | * Return new maximum or -EINVAL if the configuration space is empty | 1500 | * Return new maximum or -EINVAL if the configuration space is empty |
1492 | */ | 1501 | */ |
1493 | int snd_pcm_hw_param_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | 1502 | static int snd_pcm_hw_param_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, |
1494 | snd_pcm_hw_param_t var, unsigned int val, int *dir) | 1503 | snd_pcm_hw_param_t var, unsigned int val, |
1504 | int *dir) | ||
1495 | { | 1505 | { |
1496 | int changed = _snd_pcm_hw_param_max(params, var, val, dir ? *dir : 0); | 1506 | int changed = _snd_pcm_hw_param_max(params, var, val, dir ? *dir : 0); |
1497 | if (changed < 0) | 1507 | if (changed < 0) |
@@ -2564,9 +2574,6 @@ snd_pcm_sframes_t snd_pcm_lib_readv(snd_pcm_substream_t *substream, | |||
2564 | EXPORT_SYMBOL(snd_interval_refine); | 2574 | EXPORT_SYMBOL(snd_interval_refine); |
2565 | EXPORT_SYMBOL(snd_interval_list); | 2575 | EXPORT_SYMBOL(snd_interval_list); |
2566 | EXPORT_SYMBOL(snd_interval_ratnum); | 2576 | EXPORT_SYMBOL(snd_interval_ratnum); |
2567 | EXPORT_SYMBOL(snd_interval_muldivk); | ||
2568 | EXPORT_SYMBOL(snd_interval_mulkdiv); | ||
2569 | EXPORT_SYMBOL(snd_interval_div); | ||
2570 | EXPORT_SYMBOL(_snd_pcm_hw_params_any); | 2577 | EXPORT_SYMBOL(_snd_pcm_hw_params_any); |
2571 | EXPORT_SYMBOL(_snd_pcm_hw_param_min); | 2578 | EXPORT_SYMBOL(_snd_pcm_hw_param_min); |
2572 | EXPORT_SYMBOL(_snd_pcm_hw_param_set); | 2579 | EXPORT_SYMBOL(_snd_pcm_hw_param_set); |
@@ -2580,7 +2587,6 @@ EXPORT_SYMBOL(snd_pcm_hw_param_last); | |||
2580 | EXPORT_SYMBOL(snd_pcm_hw_param_near); | 2587 | EXPORT_SYMBOL(snd_pcm_hw_param_near); |
2581 | EXPORT_SYMBOL(snd_pcm_hw_param_set); | 2588 | EXPORT_SYMBOL(snd_pcm_hw_param_set); |
2582 | EXPORT_SYMBOL(snd_pcm_hw_refine); | 2589 | EXPORT_SYMBOL(snd_pcm_hw_refine); |
2583 | EXPORT_SYMBOL(snd_pcm_hw_params); | ||
2584 | EXPORT_SYMBOL(snd_pcm_hw_constraints_init); | 2590 | EXPORT_SYMBOL(snd_pcm_hw_constraints_init); |
2585 | EXPORT_SYMBOL(snd_pcm_hw_constraints_complete); | 2591 | EXPORT_SYMBOL(snd_pcm_hw_constraints_complete); |
2586 | EXPORT_SYMBOL(snd_pcm_hw_constraint_list); | 2592 | EXPORT_SYMBOL(snd_pcm_hw_constraint_list); |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index cad9bbde9986..4e582415a086 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -337,8 +337,8 @@ out: | |||
337 | return err; | 337 | return err; |
338 | } | 338 | } |
339 | 339 | ||
340 | int snd_pcm_hw_params(snd_pcm_substream_t *substream, | 340 | static int snd_pcm_hw_params(snd_pcm_substream_t *substream, |
341 | snd_pcm_hw_params_t *params) | 341 | snd_pcm_hw_params_t *params) |
342 | { | 342 | { |
343 | snd_pcm_runtime_t *runtime; | 343 | snd_pcm_runtime_t *runtime; |
344 | int err; | 344 | int err; |
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c index 21e569062bc3..df1e2bb39745 100644 --- a/sound/core/seq/seq_midi_event.c +++ b/sound/core/seq/seq_midi_event.c | |||
@@ -171,11 +171,13 @@ void snd_midi_event_reset_decode(snd_midi_event_t *dev) | |||
171 | spin_unlock_irqrestore(&dev->lock, flags); | 171 | spin_unlock_irqrestore(&dev->lock, flags); |
172 | } | 172 | } |
173 | 173 | ||
174 | #if 0 | ||
174 | void snd_midi_event_init(snd_midi_event_t *dev) | 175 | void snd_midi_event_init(snd_midi_event_t *dev) |
175 | { | 176 | { |
176 | snd_midi_event_reset_encode(dev); | 177 | snd_midi_event_reset_encode(dev); |
177 | snd_midi_event_reset_decode(dev); | 178 | snd_midi_event_reset_decode(dev); |
178 | } | 179 | } |
180 | #endif /* 0 */ | ||
179 | 181 | ||
180 | void snd_midi_event_no_status(snd_midi_event_t *dev, int on) | 182 | void snd_midi_event_no_status(snd_midi_event_t *dev, int on) |
181 | { | 183 | { |
@@ -185,6 +187,7 @@ void snd_midi_event_no_status(snd_midi_event_t *dev, int on) | |||
185 | /* | 187 | /* |
186 | * resize buffer | 188 | * resize buffer |
187 | */ | 189 | */ |
190 | #if 0 | ||
188 | int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize) | 191 | int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize) |
189 | { | 192 | { |
190 | unsigned char *new_buf, *old_buf; | 193 | unsigned char *new_buf, *old_buf; |
@@ -204,6 +207,7 @@ int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize) | |||
204 | kfree(old_buf); | 207 | kfree(old_buf); |
205 | return 0; | 208 | return 0; |
206 | } | 209 | } |
210 | #endif /* 0 */ | ||
207 | 211 | ||
208 | /* | 212 | /* |
209 | * read bytes and encode to sequencer event if finished | 213 | * read bytes and encode to sequencer event if finished |
@@ -517,8 +521,6 @@ static int extra_decode_xrpn(snd_midi_event_t *dev, unsigned char *buf, int coun | |||
517 | 521 | ||
518 | EXPORT_SYMBOL(snd_midi_event_new); | 522 | EXPORT_SYMBOL(snd_midi_event_new); |
519 | EXPORT_SYMBOL(snd_midi_event_free); | 523 | EXPORT_SYMBOL(snd_midi_event_free); |
520 | EXPORT_SYMBOL(snd_midi_event_resize_buffer); | ||
521 | EXPORT_SYMBOL(snd_midi_event_init); | ||
522 | EXPORT_SYMBOL(snd_midi_event_reset_encode); | 524 | EXPORT_SYMBOL(snd_midi_event_reset_encode); |
523 | EXPORT_SYMBOL(snd_midi_event_reset_decode); | 525 | EXPORT_SYMBOL(snd_midi_event_reset_decode); |
524 | EXPORT_SYMBOL(snd_midi_event_no_status); | 526 | EXPORT_SYMBOL(snd_midi_event_no_status); |
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 3afc7cc0c9a7..98de2e711fde 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c | |||
@@ -672,7 +672,8 @@ static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int atomic, i | |||
672 | * process a received queue-control event. | 672 | * process a received queue-control event. |
673 | * this function is exported for seq_sync.c. | 673 | * this function is exported for seq_sync.c. |
674 | */ | 674 | */ |
675 | void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop) | 675 | static void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, |
676 | int atomic, int hop) | ||
676 | { | 677 | { |
677 | switch (ev->type) { | 678 | switch (ev->type) { |
678 | case SNDRV_SEQ_EVENT_START: | 679 | case SNDRV_SEQ_EVENT_START: |
diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h index b1bf5519fb3b..ea3c54216ea8 100644 --- a/sound/core/seq/seq_queue.h +++ b/sound/core/seq/seq_queue.h | |||
@@ -111,7 +111,6 @@ int snd_seq_queue_use(int queueid, int client, int use); | |||
111 | int snd_seq_queue_is_used(int queueid, int client); | 111 | int snd_seq_queue_is_used(int queueid, int client); |
112 | 112 | ||
113 | int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop); | 113 | int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop); |
114 | void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop); | ||
115 | 114 | ||
116 | /* | 115 | /* |
117 | * 64bit division - for sync stuff.. | 116 | * 64bit division - for sync stuff.. |
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index 753f1c0863cc..a7f76fc95280 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c | |||
@@ -36,7 +36,8 @@ extern int seq_default_timer_resolution; | |||
36 | 36 | ||
37 | #define SKEW_BASE 0x10000 /* 16bit shift */ | 37 | #define SKEW_BASE 0x10000 /* 16bit shift */ |
38 | 38 | ||
39 | void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, int tempo, int ppq, int nticks) | 39 | static void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, |
40 | int tempo, int ppq, int nticks) | ||
40 | { | 41 | { |
41 | if (tempo < 1000000) | 42 | if (tempo < 1000000) |
42 | tick->resolution = (tempo * 1000) / ppq; | 43 | tick->resolution = (tempo * 1000) / ppq; |
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h index 4c0872df8931..287ed68591de 100644 --- a/sound/core/seq/seq_timer.h +++ b/sound/core/seq/seq_timer.h | |||
@@ -64,8 +64,6 @@ extern seq_timer_t *snd_seq_timer_new(void); | |||
64 | /* delete timer (destructor) */ | 64 | /* delete timer (destructor) */ |
65 | extern void snd_seq_timer_delete(seq_timer_t **tmr); | 65 | extern void snd_seq_timer_delete(seq_timer_t **tmr); |
66 | 66 | ||
67 | void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, int tempo, int ppq, int nticks); | ||
68 | |||
69 | /* */ | 67 | /* */ |
70 | static inline void snd_seq_timer_update_tick(seq_timer_tick_t *tick, unsigned long resolution) | 68 | static inline void snd_seq_timer_update_tick(seq_timer_tick_t *tick, unsigned long resolution) |
71 | { | 69 | { |
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index 58c56a198d2a..a66484b5cf0e 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c | |||
@@ -110,7 +110,7 @@ static int snd_virmidi_dev_receive_event(snd_virmidi_dev_t *rdev, snd_seq_event_ | |||
110 | * handler of a remote port which is attached to the virmidi via | 110 | * handler of a remote port which is attached to the virmidi via |
111 | * SNDRV_VIRMIDI_SEQ_ATTACH. | 111 | * SNDRV_VIRMIDI_SEQ_ATTACH. |
112 | */ | 112 | */ |
113 | /* exported */ | 113 | #if 0 |
114 | int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev) | 114 | int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev) |
115 | { | 115 | { |
116 | snd_virmidi_dev_t *rdev; | 116 | snd_virmidi_dev_t *rdev; |
@@ -118,6 +118,7 @@ int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev) | |||
118 | rdev = rmidi->private_data; | 118 | rdev = rmidi->private_data; |
119 | return snd_virmidi_dev_receive_event(rdev, ev); | 119 | return snd_virmidi_dev_receive_event(rdev, ev); |
120 | } | 120 | } |
121 | #endif /* 0 */ | ||
121 | 122 | ||
122 | /* | 123 | /* |
123 | * event handler of virmidi port | 124 | * event handler of virmidi port |
@@ -548,4 +549,3 @@ module_init(alsa_virmidi_init) | |||
548 | module_exit(alsa_virmidi_exit) | 549 | module_exit(alsa_virmidi_exit) |
549 | 550 | ||
550 | EXPORT_SYMBOL(snd_virmidi_new); | 551 | EXPORT_SYMBOL(snd_virmidi_new); |
551 | EXPORT_SYMBOL(snd_virmidi_receive); | ||
diff --git a/sound/core/sound.c b/sound/core/sound.c index 88e052079f85..fa92e660ec2c 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
@@ -431,7 +431,6 @@ EXPORT_SYMBOL(snd_card_pci_resume); | |||
431 | EXPORT_SYMBOL(snd_device_new); | 431 | EXPORT_SYMBOL(snd_device_new); |
432 | EXPORT_SYMBOL(snd_device_register); | 432 | EXPORT_SYMBOL(snd_device_register); |
433 | EXPORT_SYMBOL(snd_device_free); | 433 | EXPORT_SYMBOL(snd_device_free); |
434 | EXPORT_SYMBOL(snd_device_free_all); | ||
435 | /* isadma.c */ | 434 | /* isadma.c */ |
436 | #ifdef CONFIG_ISA | 435 | #ifdef CONFIG_ISA |
437 | EXPORT_SYMBOL(snd_dma_program); | 436 | EXPORT_SYMBOL(snd_dma_program); |
diff --git a/sound/core/timer.c b/sound/core/timer.c index cb011a1d4c3e..d67a5e91a108 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
@@ -845,7 +845,7 @@ int snd_timer_dev_register(snd_device_t *dev) | |||
845 | return 0; | 845 | return 0; |
846 | } | 846 | } |
847 | 847 | ||
848 | int snd_timer_unregister(snd_timer_t *timer) | 848 | static int snd_timer_unregister(snd_timer_t *timer) |
849 | { | 849 | { |
850 | struct list_head *p, *n; | 850 | struct list_head *p, *n; |
851 | snd_timer_instance_t *ti; | 851 | snd_timer_instance_t *ti; |
@@ -946,11 +946,6 @@ struct snd_timer_system_private { | |||
946 | unsigned long correction; | 946 | unsigned long correction; |
947 | }; | 947 | }; |
948 | 948 | ||
949 | unsigned int snd_timer_system_resolution(void) | ||
950 | { | ||
951 | return 1000000000L / HZ; | ||
952 | } | ||
953 | |||
954 | static void snd_timer_s_function(unsigned long data) | 949 | static void snd_timer_s_function(unsigned long data) |
955 | { | 950 | { |
956 | snd_timer_t *timer = (snd_timer_t *)data; | 951 | snd_timer_t *timer = (snd_timer_t *)data; |
@@ -1938,4 +1933,3 @@ EXPORT_SYMBOL(snd_timer_global_free); | |||
1938 | EXPORT_SYMBOL(snd_timer_global_register); | 1933 | EXPORT_SYMBOL(snd_timer_global_register); |
1939 | EXPORT_SYMBOL(snd_timer_global_unregister); | 1934 | EXPORT_SYMBOL(snd_timer_global_unregister); |
1940 | EXPORT_SYMBOL(snd_timer_interrupt); | 1935 | EXPORT_SYMBOL(snd_timer_interrupt); |
1941 | EXPORT_SYMBOL(snd_timer_system_resolution); | ||