git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
sound
/
core
/
seq
/
seq_instr.c
diff --git
a/sound/core/seq/seq_instr.c
b/sound/core/seq/seq_instr.c
index
d8ca16f
..
3949fd9
100644
(file)
--- a/
sound/core/seq/seq_instr.c
+++ b/
sound/core/seq/seq_instr.c
@@
-29,8
+29,6
@@
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer instrument library.");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer instrument library.");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_SUPPORTED_DEVICE("sound");
static void snd_instr_lock_ops(snd_seq_kinstr_list_t *list)
static void snd_instr_lock_ops(snd_seq_kinstr_list_t *list)
@@
-53,10
+51,7
@@
static void snd_instr_unlock_ops(snd_seq_kinstr_list_t *list)
snd_seq_kcluster_t *snd_seq_cluster_new(int atomic)
{
snd_seq_kcluster_t *snd_seq_cluster_new(int atomic)
{
- snd_seq_kcluster_t *cluster;
-
- cluster = (snd_seq_kcluster_t *) snd_kcalloc(sizeof(snd_seq_kcluster_t), atomic ? GFP_ATOMIC : GFP_KERNEL);
- return cluster;
+ 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)
}
void snd_seq_cluster_free(snd_seq_kcluster_t *cluster, int atomic)
@@
-70,7
+65,7
@@
snd_seq_kinstr_t *snd_seq_instr_new(int add_len, int atomic)
{
snd_seq_kinstr_t *instr;
{
snd_seq_kinstr_t *instr;
- instr =
(snd_seq_kinstr_t *) snd_kcalloc(
sizeof(snd_seq_kinstr_t) + add_len, atomic ? GFP_ATOMIC : GFP_KERNEL);
+ instr =
kcalloc(1,
sizeof(snd_seq_kinstr_t) + add_len, atomic ? GFP_ATOMIC : GFP_KERNEL);
if (instr == NULL)
return NULL;
instr->add_len = add_len;
if (instr == NULL)
return NULL;
instr->add_len = add_len;
@@
-94,7
+89,7
@@
snd_seq_kinstr_list_t *snd_seq_instr_list_new(void)
{
snd_seq_kinstr_list_t *list;
{
snd_seq_kinstr_list_t *list;
- list =
(snd_seq_kinstr_list_t *) snd_kcalloc(
sizeof(snd_seq_kinstr_list_t), GFP_KERNEL);
+ list =
kcalloc(1,
sizeof(snd_seq_kinstr_list_t), GFP_KERNEL);
if (list == NULL)
return NULL;
spin_lock_init(&list->lock);
if (list == NULL)
return NULL;
spin_lock_init(&list->lock);