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
/
isa
/
gus
/
gus_main.c
diff --git
a/sound/isa/gus/gus_main.c
b/sound/isa/gus/gus_main.c
index
64558c2
..
73f81c1
100644
(file)
--- a/
sound/isa/gus/gus_main.c
+++ b/
sound/isa/gus/gus_main.c
@@
-35,8
+35,6
@@
MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards");
MODULE_LICENSE("GPL");
-#define chip_t snd_gus_card_t
-
static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches);
int snd_gus_use_inc(snd_gus_card_t * gus)
static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches);
int snd_gus_use_inc(snd_gus_card_t * gus)
@@
-133,13
+131,13
@@
static int snd_gus_free(snd_gus_card_t *gus)
disable_dma(gus->gf1.dma2);
free_dma(gus->gf1.dma2);
}
disable_dma(gus->gf1.dma2);
free_dma(gus->gf1.dma2);
}
-
snd_magic_
kfree(gus);
+ kfree(gus);
return 0;
}
static int snd_gus_dev_free(snd_device_t *device)
{
return 0;
}
static int snd_gus_dev_free(snd_device_t *device)
{
- snd_gus_card_t *gus =
snd_magic_cast(snd_gus_card_t, device->device_data, return -ENXIO)
;
+ snd_gus_card_t *gus =
device->device_data
;
return snd_gus_free(gus);
}
return snd_gus_free(gus);
}
@@
-159,7
+157,7
@@
int snd_gus_create(snd_card_t * card,
};
*rgus = NULL;
};
*rgus = NULL;
- gus =
snd_magic_kcalloc(snd_gus_card_t, 0
, GFP_KERNEL);
+ gus =
kcalloc(1, sizeof(*gus)
, GFP_KERNEL);
if (gus == NULL)
return -ENOMEM;
gus->gf1.irq = -1;
if (gus == NULL)
return -ENOMEM;
gus->gf1.irq = -1;
@@
-421,7
+419,7
@@
static int snd_gus_check_version(snd_gus_card_t * gus)
static void snd_gus_seq_dev_free(snd_seq_device_t *seq_dev)
{
static void snd_gus_seq_dev_free(snd_seq_device_t *seq_dev)
{
- snd_gus_card_t *gus = s
nd_magic_cast(snd_gus_card_t, seq_dev->private_data, return)
;
+ snd_gus_card_t *gus = s
eq_dev->private_data
;
gus->seq_dev = NULL;
}
gus->seq_dev = NULL;
}