From 5e2da20648e39a0e3cb33861499b686a6fe38112 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Nov 2005 14:36:44 +0100 Subject: [ALSA] Remove xxx_t typedefs: ISA GUS Remove xxx_t typedefs from the ISA GUS drivers. Signed-off-by: Takashi Iwai --- sound/isa/gus/gusmax.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'sound/isa/gus/gusmax.c') diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index 0bb44b51934..63311cdb4a1 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."); struct snd_gusmax { int irq; - snd_card_t *card; - snd_gus_card_t *gus; - cs4231_t *cs4231; + struct snd_card *card; + struct snd_gus_card *gus; + struct snd_cs4231 *cs4231; unsigned short gus_status_reg; unsigned short pcm_status_reg; }; -static snd_card_t *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; +static struct snd_card *snd_gusmax_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; #define PFX "gusmax: " -static int __init snd_gusmax_detect(snd_gus_card_t * gus) +static int __init snd_gusmax_detect(struct snd_gus_card * gus) { unsigned char d; @@ -126,7 +126,7 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *r return IRQ_RETVAL(handled); } -static void __init snd_gusmax_init(int dev, snd_card_t * card, snd_gus_card_t * gus) +static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus) { gus->equal_irq = 1; gus->codec_flag = 1; @@ -144,10 +144,10 @@ static void __init snd_gusmax_init(int dev, snd_card_t * card, snd_gus_card_t * #define CS4231_PRIVATE( left, right, shift, mute ) \ ((left << 24)|(right << 16)|(shift<<8)|mute) -static int __init snd_gusmax_mixer(cs4231_t *chip) +static int __init snd_gusmax_mixer(struct snd_cs4231 *chip) { - snd_card_t *card = chip->card; - snd_ctl_elem_id_t id1, id2; + struct snd_card *card = chip->card; + struct snd_ctl_elem_id id1, id2; int err; memset(&id1, 0, sizeof(id1)); @@ -193,7 +193,7 @@ static int __init snd_gusmax_mixer(cs4231_t *chip) return 0; } -static void snd_gusmax_free(snd_card_t *card) +static void snd_gusmax_free(struct snd_card *card) { struct snd_gusmax *maxcard = (struct snd_gusmax *)card->private_data; @@ -208,9 +208,9 @@ static int __init snd_gusmax_probe(int dev) static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; static int possible_dmas[] = {5, 6, 7, 1, 3, -1}; int xirq, xdma1, xdma2, err; - snd_card_t *card; - snd_gus_card_t *gus = NULL; - cs4231_t *cs4231; + struct snd_card *card; + struct snd_gus_card *gus = NULL; + struct snd_cs4231 *cs4231; struct snd_gusmax *maxcard; card = snd_card_new(index[dev], id[dev], THIS_MODULE, -- cgit v1.2.3