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_timer.c
diff --git
a/sound/isa/gus/gus_timer.c
b/sound/isa/gus/gus_timer.c
index
854b35d
..
9876603
100644
(file)
--- a/
sound/isa/gus/gus_timer.c
+++ b/
sound/isa/gus/gus_timer.c
@@
-26,8
+26,6
@@
#include <sound/core.h>
#include <sound/gus.h>
#include <sound/core.h>
#include <sound/gus.h>
-#define chip_t snd_gus_card_t
-
/*
* Timer 1 - 80us
*/
/*
* Timer 1 - 80us
*/
@@
-146,13
+144,13
@@
static struct _snd_timer_hardware snd_gf1_timer2 =
static void snd_gf1_timer1_free(snd_timer_t *timer)
{
static void snd_gf1_timer1_free(snd_timer_t *timer)
{
- snd_gus_card_t *gus =
snd_magic_cast(snd_gus_card_t, timer->private_data, return)
;
+ snd_gus_card_t *gus =
timer->private_data
;
gus->gf1.timer1 = NULL;
}
static void snd_gf1_timer2_free(snd_timer_t *timer)
{
gus->gf1.timer1 = NULL;
}
static void snd_gf1_timer2_free(snd_timer_t *timer)
{
- snd_gus_card_t *gus =
snd_magic_cast(snd_gus_card_t, timer->private_data, return)
;
+ snd_gus_card_t *gus =
timer->private_data
;
gus->gf1.timer2 = NULL;
}
gus->gf1.timer2 = NULL;
}