aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/sb8.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/sb/sb8.c')
-rw-r--r--sound/isa/sb/sb8.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 0bc0a3afdabc..5116038fcb4a 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -59,11 +59,11 @@ struct snd_sb8 {
59 struct resource *fm_res; /* used to block FM i/o region for legacy cards */ 59 struct resource *fm_res; /* used to block FM i/o region for legacy cards */
60}; 60};
61 61
62static snd_card_t *snd_sb8_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 62static struct snd_card *snd_sb8_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
63 63
64static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id, struct pt_regs *regs) 64static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id, struct pt_regs *regs)
65{ 65{
66 sb_t *chip = dev_id; 66 struct snd_sb *chip = dev_id;
67 67
68 if (chip->open & SB_OPEN_PCM) { 68 if (chip->open & SB_OPEN_PCM) {
69 return snd_sb8dsp_interrupt(chip); 69 return snd_sb8dsp_interrupt(chip);
@@ -72,7 +72,7 @@ static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id, struct pt_regs *regs
72 } 72 }
73} 73}
74 74
75static void snd_sb8_free(snd_card_t *card) 75static void snd_sb8_free(struct snd_card *card)
76{ 76{
77 struct snd_sb8 *acard = (struct snd_sb8 *)card->private_data; 77 struct snd_sb8 *acard = (struct snd_sb8 *)card->private_data;
78 78
@@ -83,10 +83,10 @@ static void snd_sb8_free(snd_card_t *card)
83 83
84static int __init snd_sb8_probe(int dev) 84static int __init snd_sb8_probe(int dev)
85{ 85{
86 sb_t *chip; 86 struct snd_sb *chip;
87 snd_card_t *card; 87 struct snd_card *card;
88 struct snd_sb8 *acard; 88 struct snd_sb8 *acard;
89 opl3_t *opl3; 89 struct snd_opl3 *opl3;
90 int err; 90 int err;
91 91
92 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 92 card = snd_card_new(index[dev], id[dev], THIS_MODULE,