diff options
Diffstat (limited to 'sound/isa/gus/gusmax.c')
-rw-r--r-- | sound/isa/gus/gusmax.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index 0bb44b519340..63311cdb4a1a 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
@@ -73,18 +73,18 @@ MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS MAX driver."); | |||
73 | 73 | ||
74 | struct snd_gusmax { | 74 | struct snd_gusmax { |
75 | int irq; | 75 | int irq; |
76 | snd_card_t *card; | 76 | struct snd_card *card; |
77 | snd_gus_card_t *gus; | 77 | struct snd_gus_card *gus; |
78 | cs4231_t *cs4231; | 78 | struct snd_cs4231 *cs4231; |
79 | unsigned short gus_status_reg; | 79 | unsigned short gus_status_reg; |
80 | unsigned short pcm_status_reg; | 80 | unsigned short pcm_status_reg; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static snd_card_t *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; | 83 | static struct snd_card *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; |
84 | 84 | ||
85 | #define PFX "gusmax: " | 85 | #define PFX "gusmax: " |
86 | 86 | ||
87 | static int __init snd_gusmax_detect(snd_gus_card_t * gus) | 87 | static int __init snd_gusmax_detect(struct snd_gus_card * gus) |
88 | { | 88 | { |
89 | unsigned char d; | 89 | unsigned char d; |
90 | 90 | ||
@@ -126,7 +126,7 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *r | |||
126 | return IRQ_RETVAL(handled); | 126 | return IRQ_RETVAL(handled); |
127 | } | 127 | } |
128 | 128 | ||
129 | static void __init snd_gusmax_init(int dev, snd_card_t * card, snd_gus_card_t * gus) | 129 | static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus) |
130 | { | 130 | { |
131 | gus->equal_irq = 1; | 131 | gus->equal_irq = 1; |
132 | gus->codec_flag = 1; | 132 | gus->codec_flag = 1; |
@@ -144,10 +144,10 @@ static void __init snd_gusmax_init(int dev, snd_card_t * card, snd_gus_card_t * | |||
144 | #define CS4231_PRIVATE( left, right, shift, mute ) \ | 144 | #define CS4231_PRIVATE( left, right, shift, mute ) \ |
145 | ((left << 24)|(right << 16)|(shift<<8)|mute) | 145 | ((left << 24)|(right << 16)|(shift<<8)|mute) |
146 | 146 | ||
147 | static int __init snd_gusmax_mixer(cs4231_t *chip) | 147 | static int __init snd_gusmax_mixer(struct snd_cs4231 *chip) |
148 | { | 148 | { |
149 | snd_card_t *card = chip->card; | 149 | struct snd_card *card = chip->card; |
150 | snd_ctl_elem_id_t id1, id2; | 150 | struct snd_ctl_elem_id id1, id2; |
151 | int err; | 151 | int err; |
152 | 152 | ||
153 | memset(&id1, 0, sizeof(id1)); | 153 | memset(&id1, 0, sizeof(id1)); |
@@ -193,7 +193,7 @@ static int __init snd_gusmax_mixer(cs4231_t *chip) | |||
193 | return 0; | 193 | return 0; |
194 | } | 194 | } |
195 | 195 | ||
196 | static void snd_gusmax_free(snd_card_t *card) | 196 | static void snd_gusmax_free(struct snd_card *card) |
197 | { | 197 | { |
198 | struct snd_gusmax *maxcard = (struct snd_gusmax *)card->private_data; | 198 | struct snd_gusmax *maxcard = (struct snd_gusmax *)card->private_data; |
199 | 199 | ||
@@ -208,9 +208,9 @@ static int __init snd_gusmax_probe(int dev) | |||
208 | static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; | 208 | static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; |
209 | static int possible_dmas[] = {5, 6, 7, 1, 3, -1}; | 209 | static int possible_dmas[] = {5, 6, 7, 1, 3, -1}; |
210 | int xirq, xdma1, xdma2, err; | 210 | int xirq, xdma1, xdma2, err; |
211 | snd_card_t *card; | 211 | struct snd_card *card; |
212 | snd_gus_card_t *gus = NULL; | 212 | struct snd_gus_card *gus = NULL; |
213 | cs4231_t *cs4231; | 213 | struct snd_cs4231 *cs4231; |
214 | struct snd_gusmax *maxcard; | 214 | struct snd_gusmax *maxcard; |
215 | 215 | ||
216 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 216 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, |