Commit d3a7e476 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[ALSA] Remove xxx_t typedefs: ISA ES1688

Modules: ES1688 driver

Remove xxx_t typedefs from the ISA ES1688 driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ba2375a4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define ES1688_HW_688 0x0001 #define ES1688_HW_688 0x0001
#define ES1688_HW_1688 0x0002 #define ES1688_HW_1688 0x0002
struct _snd_es1688 { struct snd_es1688 {
unsigned long port; /* port of ESS chip */ unsigned long port; /* port of ESS chip */
struct resource *res_port; struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */ unsigned long mpu_port; /* MPU-401 port of ESS chip */
...@@ -44,17 +44,15 @@ struct _snd_es1688 { ...@@ -44,17 +44,15 @@ struct _snd_es1688 {
unsigned char pad; unsigned char pad;
unsigned int dma_size; unsigned int dma_size;
snd_card_t *card; struct snd_card *card;
snd_pcm_t *pcm; struct snd_pcm *pcm;
snd_pcm_substream_t *playback_substream; struct snd_pcm_substream *playback_substream;
snd_pcm_substream_t *capture_substream; struct snd_pcm_substream *capture_substream;
spinlock_t reg_lock; spinlock_t reg_lock;
spinlock_t mixer_lock; spinlock_t mixer_lock;
}; };
typedef struct _snd_es1688 es1688_t;
/* I/O ports */ /* I/O ports */
#define ES1688P(codec, x) ((codec)->port + e_s_s_ESS1688##x) #define ES1688P(codec, x) ((codec)->port + e_s_s_ESS1688##x)
...@@ -107,17 +105,17 @@ typedef struct _snd_es1688 es1688_t; ...@@ -107,17 +105,17 @@ typedef struct _snd_es1688 es1688_t;
*/ */
void snd_es1688_mixer_write(es1688_t *chip, unsigned char reg, unsigned char data); void snd_es1688_mixer_write(struct snd_es1688 *chip, unsigned char reg, unsigned char data);
int snd_es1688_create(snd_card_t * card, int snd_es1688_create(struct snd_card *card,
unsigned long port, unsigned long port,
unsigned long mpu_port, unsigned long mpu_port,
int irq, int irq,
int mpu_irq, int mpu_irq,
int dma8, int dma8,
unsigned short hardware, unsigned short hardware,
es1688_t ** rchip); struct snd_es1688 ** rchip);
int snd_es1688_pcm(es1688_t *chip, int device, snd_pcm_t ** rpcm); int snd_es1688_pcm(struct snd_es1688 *chip, int device, struct snd_pcm ** rpcm);
int snd_es1688_mixer(es1688_t *chip); int snd_es1688_mixer(struct snd_es1688 *chip);
#endif /* __SOUND_ES1688_H */ #endif /* __SOUND_ES1688_H */
...@@ -68,7 +68,7 @@ MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ESx688 driver."); ...@@ -68,7 +68,7 @@ MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ESx688 driver.");
module_param_array(dma8, int, NULL, 0444); module_param_array(dma8, int, NULL, 0444);
MODULE_PARM_DESC(dma8, "8-bit DMA # for ESx688 driver."); MODULE_PARM_DESC(dma8, "8-bit DMA # for ESx688 driver.");
static snd_card_t *snd_audiodrive_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; static struct snd_card *snd_audiodrive_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#define PFX "es1688: " #define PFX "es1688: "
...@@ -77,10 +77,10 @@ static int __init snd_audiodrive_probe(int dev) ...@@ -77,10 +77,10 @@ static int __init snd_audiodrive_probe(int dev)
static int possible_irqs[] = {5, 9, 10, 7, -1}; static int possible_irqs[] = {5, 9, 10, 7, -1};
static int possible_dmas[] = {1, 3, 0, -1}; static int possible_dmas[] = {1, 3, 0, -1};
int xirq, xdma, xmpu_irq; int xirq, xdma, xmpu_irq;
snd_card_t *card; struct snd_card *card;
es1688_t *chip; struct snd_es1688 *chip;
opl3_t *opl3; struct snd_opl3 *opl3;
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment