X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fcore%2Fseq%2Fseq_instr.c;h=315196768f9ccbad2af86db1bda18a2af9caab84;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=3949fd9fa83d45fa169e5ad56948791dcca66912;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/sound/core/seq/seq_instr.c b/sound/core/seq/seq_instr.c index 3949fd9fa..315196768 100644 --- a/sound/core/seq/seq_instr.c +++ b/sound/core/seq/seq_instr.c @@ -49,19 +49,7 @@ static void snd_instr_unlock_ops(snd_seq_kinstr_list_t *list) } } -snd_seq_kcluster_t *snd_seq_cluster_new(int atomic) -{ - return kcalloc(1, sizeof(snd_seq_kcluster_t), atomic ? GFP_ATOMIC : GFP_KERNEL); -} - -void snd_seq_cluster_free(snd_seq_kcluster_t *cluster, int atomic) -{ - if (cluster == NULL) - return; - kfree(cluster); -} - -snd_seq_kinstr_t *snd_seq_instr_new(int add_len, int atomic) +static snd_seq_kinstr_t *snd_seq_instr_new(int add_len, int atomic) { snd_seq_kinstr_t *instr; @@ -72,7 +60,7 @@ snd_seq_kinstr_t *snd_seq_instr_new(int add_len, int atomic) return instr; } -int snd_seq_instr_free(snd_seq_kinstr_t *instr, int atomic) +static int snd_seq_instr_free(snd_seq_kinstr_t *instr, int atomic) { int result = 0; @@ -132,7 +120,7 @@ void snd_seq_instr_list_free(snd_seq_kinstr_list_t **list_ptr) while ((cluster = list->chash[idx]) != NULL) { list->chash[idx] = cluster->next; list->ccount--; - snd_seq_cluster_free(cluster, 0); + kfree(cluster); } } kfree(list);