aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/isa/cmi8330.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 6038529d5af2..cf160062beb0 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -137,26 +137,26 @@ static unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
137 0x0 /* 26 - cd-in rec gain */ 137 0x0 /* 26 - cd-in rec gain */
138}; 138};
139 139
140typedef int (*snd_pcm_open_callback_t)(snd_pcm_substream_t *); 140typedef int (*snd_pcm_open_callback_t)(struct snd_pcm_substream *);
141 141
142struct snd_cmi8330 { 142struct snd_cmi8330 {
143#ifdef CONFIG_PNP 143#ifdef CONFIG_PNP
144 struct pnp_dev *cap; 144 struct pnp_dev *cap;
145 struct pnp_dev *play; 145 struct pnp_dev *play;
146#endif 146#endif
147 snd_card_t *card; 147 struct snd_card *card;
148 ad1848_t *wss; 148 struct snd_ad1848 *wss;
149 sb_t *sb; 149 struct snd_sb *sb;
150 150
151 snd_pcm_t *pcm; 151 struct snd_pcm *pcm;
152 struct snd_cmi8330_stream { 152 struct snd_cmi8330_stream {
153 snd_pcm_ops_t ops; 153 struct snd_pcm_ops ops;
154 snd_pcm_open_callback_t open; 154 snd_pcm_open_callback_t open;
155 void *private_data; /* sb or wss */ 155 void *private_data; /* sb or wss */
156 } streams[2]; 156 } streams[2];
157}; 157};
158 158
159static snd_card_t *snd_cmi8330_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 159static struct snd_card *snd_cmi8330_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
160 160
161#ifdef CONFIG_PNP 161#ifdef CONFIG_PNP
162 162
@@ -231,7 +231,7 @@ static unsigned char cmi8330_sb_init_values[][2] __initdata = {
231}; 231};
232 232
233 233
234static int __devinit cmi8330_add_sb_mixers(sb_t *chip) 234static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)
235{ 235{
236 int idx, err; 236 int idx, err;
237 unsigned long flags; 237 unsigned long flags;
@@ -256,7 +256,7 @@ static int __devinit cmi8330_add_sb_mixers(sb_t *chip)
256} 256}
257#endif 257#endif
258 258
259static int __devinit snd_cmi8330_mixer(snd_card_t *card, struct snd_cmi8330 *acard) 259static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
260{ 260{
261 unsigned int idx; 261 unsigned int idx;
262 int err; 262 int err;
@@ -370,7 +370,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
370#define CMI_AD_STREAM SNDRV_PCM_STREAM_PLAYBACK 370#define CMI_AD_STREAM SNDRV_PCM_STREAM_PLAYBACK
371#endif 371#endif
372 372
373static int snd_cmi8330_playback_open(snd_pcm_substream_t * substream) 373static int snd_cmi8330_playback_open(struct snd_pcm_substream *substream)
374{ 374{
375 struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream); 375 struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream);
376 376
@@ -379,7 +379,7 @@ static int snd_cmi8330_playback_open(snd_pcm_substream_t * substream)
379 return chip->streams[SNDRV_PCM_STREAM_PLAYBACK].open(substream); 379 return chip->streams[SNDRV_PCM_STREAM_PLAYBACK].open(substream);
380} 380}
381 381
382static int snd_cmi8330_capture_open(snd_pcm_substream_t * substream) 382static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream)
383{ 383{
384 struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream); 384 struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream);
385 385
@@ -388,10 +388,10 @@ static int snd_cmi8330_capture_open(snd_pcm_substream_t * substream)
388 return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream); 388 return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);
389} 389}
390 390
391static int __devinit snd_cmi8330_pcm(snd_card_t *card, struct snd_cmi8330 *chip) 391static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
392{ 392{
393 snd_pcm_t *pcm; 393 struct snd_pcm *pcm;
394 const snd_pcm_ops_t *ops; 394 const struct snd_pcm_ops *ops;
395 int err; 395 int err;
396 static snd_pcm_open_callback_t cmi_open_callbacks[2] = { 396 static snd_pcm_open_callback_t cmi_open_callbacks[2] = {
397 snd_cmi8330_playback_open, 397 snd_cmi8330_playback_open,
@@ -444,7 +444,7 @@ static int __devinit snd_cmi8330_probe(int dev,
444 struct pnp_card_link *pcard, 444 struct pnp_card_link *pcard,
445 const struct pnp_card_device_id *pid) 445 const struct pnp_card_device_id *pid)
446{ 446{
447 snd_card_t *card; 447 struct snd_card *card;
448 struct snd_cmi8330 *acard; 448 struct snd_cmi8330 *acard;
449 int i, err; 449 int i, err;
450 450
@@ -567,7 +567,7 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *card,
567 567
568static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard) 568static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard)
569{ 569{
570 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 570 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
571 571
572 snd_card_disconnect(card); 572 snd_card_disconnect(card);
573 snd_card_free_in_thread(card); 573 snd_card_free_in_thread(card);