Skip to content

L
linux
Commit db131548 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PCMCIA PDaudioCF 

Modules: PDAudioCF driver

Remove xxx_t typedefs from the PCMCIA PDaudioCF driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e437e3d7
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 77 deletions
sound/pcmcia/pdaudiocf/pdaudiocf.c
View file @ db131548
...@@ -53,7 +53,7 @@ MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard."); ...@@ -53,7 +53,7 @@ MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");
*/ */
static dev_info_t dev_info = "snd-pdaudiocf"; static dev_info_t dev_info = "snd-pdaudiocf";
static snd_card_t *card_list[SNDRV_CARDS]; static struct snd_card *card_list[SNDRV_CARDS];
static dev_link_t *dev_list; static dev_link_t *dev_list;
/* /*
...@@ -77,7 +77,7 @@ static void pdacf_release(dev_link_t *link) ...@@ -77,7 +77,7 @@ static void pdacf_release(dev_link_t *link)
/* /*
* destructor * destructor
*/ */
static int snd_pdacf_free(pdacf_t *pdacf) static int snd_pdacf_free(struct snd_pdacf *pdacf)
{ {
dev_link_t *link = &pdacf->link; dev_link_t *link = &pdacf->link;
...@@ -94,9 +94,9 @@ static int snd_pdacf_free(pdacf_t *pdacf) ...@@ -94,9 +94,9 @@ static int snd_pdacf_free(pdacf_t *pdacf)
return 0; return 0;
} }
static int snd_pdacf_dev_free(snd_device_t *device) static int snd_pdacf_dev_free(struct snd_device *device)
{ {
pdacf_t *chip = device->device_data; struct snd_pdacf *chip = device->device_data;
return snd_pdacf_free(chip); return snd_pdacf_free(chip);
} }
...@@ -108,9 +108,9 @@ static dev_link_t *snd_pdacf_attach(void) ...@@ -108,9 +108,9 @@ static dev_link_t *snd_pdacf_attach(void)
client_reg_t client_reg; /* Register with cardmgr */ client_reg_t client_reg; /* Register with cardmgr */
dev_link_t *link; /* Info for cardmgr */ dev_link_t *link; /* Info for cardmgr */
int i, ret; int i, ret;
pdacf_t *pdacf; struct snd_pdacf *pdacf;
snd_card_t *card; struct snd_card *card;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_pdacf_dev_free, .dev_free = snd_pdacf_dev_free,
}; };
...@@ -194,10 +194,10 @@ static dev_link_t *snd_pdacf_attach(void) ...@@ -194,10 +194,10 @@ static dev_link_t *snd_pdacf_attach(void)
* *
* returns 0 if successful, or a negative error code. * returns 0 if successful, or a negative error code.
*/ */
static int snd_pdacf_assign_resources(pdacf_t *pdacf, int port, int irq) static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq)
{ {
int err; int err;
snd_card_t *card = pdacf->card; struct snd_card *card = pdacf->card;
snd_printdd(KERN_DEBUG "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq); snd_printdd(KERN_DEBUG "pdacf assign resources: port = 0x%x, irq = %d\n", port, irq);
pdacf->port = port; pdacf->port = port;
...@@ -231,7 +231,7 @@ static int snd_pdacf_assign_resources(pdacf_t *pdacf, int port, int irq) ...@@ -231,7 +231,7 @@ static int snd_pdacf_assign_resources(pdacf_t *pdacf, int port, int irq)
*/ */
static void snd_pdacf_detach(dev_link_t *link) static void snd_pdacf_detach(dev_link_t *link)
{ {
pdacf_t *chip = link->priv; struct snd_pdacf *chip = link->priv;
snd_printdd(KERN_DEBUG "pdacf_detach called\n"); snd_printdd(KERN_DEBUG "pdacf_detach called\n");
/* Remove the interface data from the linked list */ /* Remove the interface data from the linked list */
...@@ -261,7 +261,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) ...@@ -261,7 +261,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static void pdacf_config(dev_link_t *link) static void pdacf_config(dev_link_t *link)
{ {
client_handle_t handle = link->handle; client_handle_t handle = link->handle;
pdacf_t *pdacf = link->priv; struct snd_pdacf *pdacf = link->priv;
tuple_t tuple; tuple_t tuple;
cisparse_t *parse = NULL; cisparse_t *parse = NULL;
config_info_t conf; config_info_t conf;
...@@ -318,7 +318,7 @@ static void pdacf_config(dev_link_t *link) ...@@ -318,7 +318,7 @@ static void pdacf_config(dev_link_t *link)
static int pdacf_event(event_t event, int priority, event_callback_args_t *args) static int pdacf_event(event_t event, int priority, event_callback_args_t *args)
{ {
dev_link_t *link = args->client_data; dev_link_t *link = args->client_data;
pdacf_t *chip = link->priv; struct snd_pdacf *chip = link->priv;
switch (event) { switch (event) {
case CS_EVENT_CARD_REMOVAL: case CS_EVENT_CARD_REMOVAL:
......
sound/pcmcia/pdaudiocf/pdaudiocf.h
View file @ db131548
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
#define PDAUDIOCF_STAT_IS_CONFIGURED (1<<1) #define PDAUDIOCF_STAT_IS_CONFIGURED (1<<1)
#define PDAUDIOCF_STAT_IS_SUSPENDED (1<<2) #define PDAUDIOCF_STAT_IS_SUSPENDED (1<<2)
typedef struct { struct snd_pdacf {
snd_card_t *card; struct snd_card *card;
int index; int index;
unsigned long port; unsigned long port;
...@@ -96,12 +96,12 @@ typedef struct { ...@@ -96,12 +96,12 @@ typedef struct {
struct tasklet_struct tq; struct tasklet_struct tq;
spinlock_t ak4117_lock; spinlock_t ak4117_lock;
ak4117_t *ak4117; struct ak4117 *ak4117;
unsigned int chip_status; unsigned int chip_status;
snd_pcm_t *pcm; struct snd_pcm *pcm;
snd_pcm_substream_t *pcm_substream; struct snd_pcm_substream *pcm_substream;
unsigned int pcm_running: 1; unsigned int pcm_running: 1;
unsigned int pcm_channels; unsigned int pcm_channels;
unsigned int pcm_swab; unsigned int pcm_swab;
...@@ -118,28 +118,28 @@ typedef struct { ...@@ -118,28 +118,28 @@ typedef struct {
/* pcmcia stuff */ /* pcmcia stuff */
dev_link_t link; dev_link_t link;
dev_node_t node; dev_node_t node;
} pdacf_t; };
static inline void pdacf_reg_write(pdacf_t *chip, unsigned char reg, unsigned short val) static inline void pdacf_reg_write(struct snd_pdacf *chip, unsigned char reg, unsigned short val)
{ {
outw(chip->regmap[reg>>1] = val, chip->port + reg); outw(chip->regmap[reg>>1] = val, chip->port + reg);
} }
static inline unsigned short pdacf_reg_read(pdacf_t *chip, unsigned char reg) static inline unsigned short pdacf_reg_read(struct snd_pdacf *chip, unsigned char reg)
{ {
return inw(chip->port + reg); return inw(chip->port + reg);
} }
pdacf_t *snd_pdacf_create(snd_card_t *card); struct snd_pdacf *snd_pdacf_create(struct snd_card *card);
int snd_pdacf_ak4117_create(pdacf_t *pdacf); int snd_pdacf_ak4117_create(struct snd_pdacf *pdacf);
void snd_pdacf_powerdown(pdacf_t *chip); void snd_pdacf_powerdown(struct snd_pdacf *chip);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int snd_pdacf_suspend(snd_card_t *card, pm_message_t state); int snd_pdacf_suspend(struct snd_card *card, pm_message_t state);
int snd_pdacf_resume(snd_card_t *card); int snd_pdacf_resume(struct snd_card *card);
#endif #endif
int snd_pdacf_pcm_new(pdacf_t *chip); int snd_pdacf_pcm_new(struct snd_pdacf *chip);
irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs);
void pdacf_tasklet(unsigned long private_data); void pdacf_tasklet(unsigned long private_data);
void pdacf_reinit(pdacf_t *chip, int resume); void pdacf_reinit(struct snd_pdacf *chip, int resume);
#endif /* __PDAUDIOCF_H */ #endif /* __PDAUDIOCF_H */
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
View file @ db131548
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
*/ */
static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg) static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg)
{ {
pdacf_t *chip = private_data; struct snd_pdacf *chip = private_data;
unsigned long timeout; unsigned long timeout;
unsigned long flags; unsigned long flags;
unsigned char res; unsigned char res;
...@@ -62,7 +62,7 @@ static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg) ...@@ -62,7 +62,7 @@ static unsigned char pdacf_ak4117_read(void *private_data, unsigned char reg)
static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned char val) static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned char val)
{ {
pdacf_t *chip = private_data; struct snd_pdacf *chip = private_data;
unsigned long timeout; unsigned long timeout;
unsigned long flags; unsigned long flags;
...@@ -81,7 +81,7 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c ...@@ -81,7 +81,7 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c
} }
#if 0 #if 0
void pdacf_dump(pdacf_t *chip) void pdacf_dump(struct snd_pdacf *chip)
{ {
printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port); printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port);
printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP)); printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP));
...@@ -94,7 +94,7 @@ void pdacf_dump(pdacf_t *chip) ...@@ -94,7 +94,7 @@ void pdacf_dump(pdacf_t *chip)
} }
#endif #endif
static int pdacf_reset(pdacf_t *chip, int powerdown) static int pdacf_reset(struct snd_pdacf *chip, int powerdown)
{ {
u16 val; u16 val;
...@@ -117,7 +117,7 @@ static int pdacf_reset(pdacf_t *chip, int powerdown) ...@@ -117,7 +117,7 @@ static int pdacf_reset(pdacf_t *chip, int powerdown)
return 0; return 0;
} }
void pdacf_reinit(pdacf_t *chip, int resume) void pdacf_reinit(struct snd_pdacf *chip, int resume)
{ {
pdacf_reset(chip, 0); pdacf_reset(chip, 0);
if (resume) if (resume)
...@@ -127,10 +127,10 @@ void pdacf_reinit(pdacf_t *chip, int resume) ...@@ -127,10 +127,10 @@ void pdacf_reinit(pdacf_t *chip, int resume)
pdacf_reg_write(chip, PDAUDIOCF_REG_IER, chip->regmap[PDAUDIOCF_REG_IER>>1]); pdacf_reg_write(chip, PDAUDIOCF_REG_IER, chip->regmap[PDAUDIOCF_REG_IER>>1]);
} }
static void pdacf_proc_read(snd_info_entry_t * entry, static void pdacf_proc_read(struct snd_info_entry * entry,
snd_info_buffer_t * buffer) struct snd_info_buffer *buffer)
{ {
pdacf_t *chip = entry->private_data; struct snd_pdacf *chip = entry->private_data;
u16 tmp; u16 tmp;
snd_iprintf(buffer, "PDAudioCF\n\n"); snd_iprintf(buffer, "PDAudioCF\n\n");
...@@ -139,17 +139,17 @@ static void pdacf_proc_read(snd_info_entry_t * entry, ...@@ -139,17 +139,17 @@ static void pdacf_proc_read(snd_info_entry_t * entry,
} }
static void pdacf_proc_init(pdacf_t *chip) static void pdacf_proc_init(struct snd_pdacf *chip)
{ {
snd_info_entry_t *entry; struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry)) if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry))
snd_info_set_text_ops(entry, chip, 1024, pdacf_proc_read); snd_info_set_text_ops(entry, chip, 1024, pdacf_proc_read);
} }
pdacf_t *snd_pdacf_create(snd_card_t *card) struct snd_pdacf *snd_pdacf_create(struct snd_card *card)
{ {
pdacf_t *chip; struct snd_pdacf *chip;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
...@@ -164,9 +164,9 @@ pdacf_t *snd_pdacf_create(snd_card_t *card) ...@@ -164,9 +164,9 @@ pdacf_t *snd_pdacf_create(snd_card_t *card)
return chip; return chip;
} }
static void snd_pdacf_ak4117_change(ak4117_t *ak4117, unsigned char c0, unsigned char c1) static void snd_pdacf_ak4117_change(struct ak4117 *ak4117, unsigned char c0, unsigned char c1)
{ {
pdacf_t *chip = ak4117->change_callback_private; struct snd_pdacf *chip = ak4117->change_callback_private;
unsigned long flags; unsigned long flags;
u16 val; u16 val;
...@@ -182,7 +182,7 @@ static void snd_pdacf_ak4117_change(ak4117_t *ak4117, unsigned char c0, unsigned ...@@ -182,7 +182,7 @@ static void snd_pdacf_ak4117_change(ak4117_t *ak4117, unsigned char c0, unsigned
spin_unlock_irqrestore(&chip->reg_lock, flags); spin_unlock_irqrestore(&chip->reg_lock, flags);
} }
int snd_pdacf_ak4117_create(pdacf_t *chip) int snd_pdacf_ak4117_create(struct snd_pdacf *chip)
{ {
int err; int err;
u16 val; u16 val;
...@@ -238,7 +238,7 @@ int snd_pdacf_ak4117_create(pdacf_t *chip) ...@@ -238,7 +238,7 @@ int snd_pdacf_ak4117_create(pdacf_t *chip)
return 0; return 0;
} }
void snd_pdacf_powerdown(pdacf_t *chip) void snd_pdacf_powerdown(struct snd_pdacf *chip)
{ {
u16 val; u16 val;
...@@ -255,9 +255,9 @@ void snd_pdacf_powerdown(pdacf_t *chip) ...@@ -255,9 +255,9 @@ void snd_pdacf_powerdown(pdacf_t *chip)
#ifdef CONFIG_PM #ifdef CONFIG_PM
int snd_pdacf_suspend(snd_card_t *card, pm_message_t state) int snd_pdacf_suspend(struct snd_card *card, pm_message_t state)
{ {
pdacf_t *chip = card->pm_private_data; struct snd_pdacf *chip = card->pm_private_data;
u16 val; u16 val;
snd_pcm_suspend_all(chip->pcm); snd_pcm_suspend_all(chip->pcm);
...@@ -270,14 +270,14 @@ int snd_pdacf_suspend(snd_card_t *card, pm_message_t state) ...@@ -270,14 +270,14 @@ int snd_pdacf_suspend(snd_card_t *card, pm_message_t state)
return 0; return 0;
} }
static inline int check_signal(pdacf_t *chip) static inline int check_signal(struct snd_pdacf *chip)
{ {
return (chip->ak4117->rcs0 & AK4117_UNLCK) == 0; return (chip->ak4117->rcs0 & AK4117_UNLCK) == 0;
} }
int snd_pdacf_resume(snd_card_t *card) int snd_pdacf_resume(struct snd_card *card)
{ {
pdacf_t *chip = card->pm_private_data; struct snd_pdacf *chip = card->pm_private_data;
int timeout = 40; int timeout = 40;
pdacf_reinit(chip, 1); pdacf_reinit(chip, 1);
......
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
View file @ db131548
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*/ */
irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs) irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs)
{ {
pdacf_t *chip = dev; struct snd_pdacf *chip = dev;
unsigned short stat; unsigned short stat;
if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE| if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE|
...@@ -204,7 +204,7 @@ static inline void pdacf_transfer_stereo24be(u8 *dst, u32 xor, unsigned int size ...@@ -204,7 +204,7 @@ static inline void pdacf_transfer_stereo24be(u8 *dst, u32 xor, unsigned int size
} }
} }
static void pdacf_transfer(pdacf_t *chip, unsigned int size, unsigned int off) static void pdacf_transfer(struct snd_pdacf *chip, unsigned int size, unsigned int off)
{ {
unsigned long rdp_port = chip->port + PDAUDIOCF_REG_MD; unsigned long rdp_port = chip->port + PDAUDIOCF_REG_MD;
unsigned int xor = chip->pcm_xor; unsigned int xor = chip->pcm_xor;
...@@ -258,7 +258,7 @@ static void pdacf_transfer(pdacf_t *chip, unsigned int size, unsigned int off) ...@@ -258,7 +258,7 @@ static void pdacf_transfer(pdacf_t *chip, unsigned int size, unsigned int off)
void pdacf_tasklet(unsigned long private_data) void pdacf_tasklet(unsigned long private_data)
{ {
pdacf_t *chip = (pdacf_t *) private_data; struct snd_pdacf *chip = (struct snd_pdacf *) private_data;
int size, off, cont, rdp, wdp; int size, off, cont, rdp, wdp;
if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE|PDAUDIOCF_STAT_IS_CONFIGURED)) != PDAUDIOCF_STAT_IS_CONFIGURED) if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE|PDAUDIOCF_STAT_IS_CONFIGURED)) != PDAUDIOCF_STAT_IS_CONFIGURED)
......
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
View file @ db131548
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
*/ */
/* get the physical page pointer on the given offset */ /* get the physical page pointer on the given offset */
static struct page *snd_pcm_get_vmalloc_page(snd_pcm_substream_t *subs, unsigned long offset) static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs, unsigned long offset)
{ {
void *pageptr = subs->runtime->dma_area + offset; void *pageptr = subs->runtime->dma_area + offset;
return vmalloc_to_page(pageptr); return vmalloc_to_page(pageptr);
...@@ -44,9 +44,9 @@ static struct page *snd_pcm_get_vmalloc_page(snd_pcm_substream_t *subs, unsigned ...@@ -44,9 +44,9 @@ static struct page *snd_pcm_get_vmalloc_page(snd_pcm_substream_t *subs, unsigned
* hw_params callback * hw_params callback
* NOTE: this may be called not only once per pcm open! * NOTE: this may be called not only once per pcm open!
*/ */
static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size) static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t size)
{ {
snd_pcm_runtime_t *runtime = subs->runtime; struct snd_pcm_runtime *runtime = subs->runtime;
if (runtime->dma_area) { if (runtime->dma_area) {
if (runtime->dma_bytes >= size) if (runtime->dma_bytes >= size)
return 0; /* already enough large */ return 0; /* already enough large */
...@@ -63,9 +63,9 @@ static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size) ...@@ -63,9 +63,9 @@ static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size)
* hw_free callback * hw_free callback
* NOTE: this may be called not only once per pcm open! * NOTE: this may be called not only once per pcm open!
*/ */
static int snd_pcm_free_vmalloc_buffer(snd_pcm_substream_t *subs) static int snd_pcm_free_vmalloc_buffer(struct snd_pcm_substream *subs)
{ {
snd_pcm_runtime_t *runtime = subs->runtime; struct snd_pcm_runtime *runtime = subs->runtime;
if (runtime->dma_area) { if (runtime->dma_area) {
vfree(runtime->dma_area); vfree(runtime->dma_area);
runtime->dma_area = NULL; runtime->dma_area = NULL;
...@@ -76,7 +76,7 @@ static int snd_pcm_free_vmalloc_buffer(snd_pcm_substream_t *subs) ...@@ -76,7 +76,7 @@ static int snd_pcm_free_vmalloc_buffer(snd_pcm_substream_t *subs)
/* /*
* clear the SRAM contents * clear the SRAM contents
*/ */
static int pdacf_pcm_clear_sram(pdacf_t *chip) static int pdacf_pcm_clear_sram(struct snd_pdacf *chip)
{ {
int max_loop = 64 * 1024; int max_loop = 64 * 1024;
...@@ -91,10 +91,10 @@ static int pdacf_pcm_clear_sram(pdacf_t *chip) ...@@ -91,10 +91,10 @@ static int pdacf_pcm_clear_sram(pdacf_t *chip)
/* /*
* pdacf_pcm_trigger - trigger callback for capture * pdacf_pcm_trigger - trigger callback for capture
*/ */
static int pdacf_pcm_trigger(snd_pcm_substream_t *subs, int cmd) static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
{ {
pdacf_t *chip = snd_pcm_substream_chip(subs); struct snd_pdacf *chip = snd_pcm_substream_chip(subs);
snd_pcm_runtime_t *runtime = subs->runtime; struct snd_pcm_runtime *runtime = subs->runtime;
int inc, ret = 0, rate; int inc, ret = 0, rate;
unsigned short mask, val, tmp; unsigned short mask, val, tmp;
...@@ -146,8 +146,8 @@ static int pdacf_pcm_trigger(snd_pcm_substream_t *subs, int cmd) ...@@ -146,8 +146,8 @@ static int pdacf_pcm_trigger(snd_pcm_substream_t *subs, int cmd)
/* /*
* pdacf_pcm_hw_params - hw_params callback for playback and capture * pdacf_pcm_hw_params - hw_params callback for playback and capture
*/ */
static int pdacf_pcm_hw_params(snd_pcm_substream_t *subs, static int pdacf_pcm_hw_params(struct snd_pcm_substream *subs,
snd_pcm_hw_params_t *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
return snd_pcm_alloc_vmalloc_buffer(subs, params_buffer_bytes(hw_params)); return snd_pcm_alloc_vmalloc_buffer(subs, params_buffer_bytes(hw_params));
} }
...@@ -155,7 +155,7 @@ static int pdacf_pcm_hw_params(snd_pcm_substream_t *subs, ...@@ -155,7 +155,7 @@ static int pdacf_pcm_hw_params(snd_pcm_substream_t *subs,
/* /*
* pdacf_pcm_hw_free - hw_free callback for playback and capture * pdacf_pcm_hw_free - hw_free callback for playback and capture
*/ */
static int pdacf_pcm_hw_free(snd_pcm_substream_t *subs) static int pdacf_pcm_hw_free(struct snd_pcm_substream *subs)
{ {
return snd_pcm_free_vmalloc_buffer(subs); return snd_pcm_free_vmalloc_buffer(subs);
} }
...@@ -163,10 +163,10 @@ static int pdacf_pcm_hw_free(snd_pcm_substream_t *subs) ...@@ -163,10 +163,10 @@ static int pdacf_pcm_hw_free(snd_pcm_substream_t *subs)
/* /*
* pdacf_pcm_prepare - prepare callback for playback and capture * pdacf_pcm_prepare - prepare callback for playback and capture
*/ */
static int pdacf_pcm_prepare(snd_pcm_substream_t *subs) static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)
{ {
pdacf_t *chip = snd_pcm_substream_chip(subs); struct snd_pdacf *chip = snd_pcm_substream_chip(subs);
snd_pcm_runtime_t *runtime = subs->runtime; struct snd_pcm_runtime *runtime = subs->runtime;
u16 val, nval, aval; u16 val, nval, aval;
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE) if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
...@@ -239,7 +239,7 @@ static int pdacf_pcm_prepare(snd_pcm_substream_t *subs) ...@@ -239,7 +239,7 @@ static int pdacf_pcm_prepare(snd_pcm_substream_t *subs)
* capture hw information * capture hw information
*/ */
static snd_pcm_hardware_t pdacf_pcm_capture_hw = { static struct snd_pcm_hardware pdacf_pcm_capture_hw = {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_MMAP_VALID), SNDRV_PCM_INFO_MMAP_VALID),
...@@ -269,10 +269,10 @@ static snd_pcm_hardware_t pdacf_pcm_capture_hw = { ...@@ -269,10 +269,10 @@ static snd_pcm_hardware_t pdacf_pcm_capture_hw = {
/* /*
* pdacf_pcm_capture_open - open callback for capture * pdacf_pcm_capture_open - open callback for capture
*/ */
static int pdacf_pcm_capture_open(snd_pcm_substream_t *subs) static int pdacf_pcm_capture_open(struct snd_pcm_substream *subs)
{ {
snd_pcm_runtime_t *runtime = subs->runtime; struct snd_pcm_runtime *runtime = subs->runtime;
pdacf_t *chip = snd_pcm_substream_chip(subs); struct snd_pdacf *chip = snd_pcm_substream_chip(subs);
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE) if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
return -EBUSY; return -EBUSY;
...@@ -287,9 +287,9 @@ static int pdacf_pcm_capture_open(snd_pcm_substream_t *subs) ...@@ -287,9 +287,9 @@ static int pdacf_pcm_capture_open(snd_pcm_substream_t *subs)
/* /*
* pdacf_pcm_capture_close - close callback for capture * pdacf_pcm_capture_close - close callback for capture
*/ */
static int pdacf_pcm_capture_close(snd_pcm_substream_t *subs) static int pdacf_pcm_capture_close(struct snd_pcm_substream *subs)
{ {
pdacf_t *chip = snd_pcm_substream_chip(subs); struct snd_pdacf *chip = snd_pcm_substream_chip(subs);
if (!chip) if (!chip)
return -EINVAL; return -EINVAL;
...@@ -302,16 +302,16 @@ static int pdacf_pcm_capture_close(snd_pcm_substream_t *subs) ...@@ -302,16 +302,16 @@ static int pdacf_pcm_capture_close(snd_pcm_substream_t *subs)
/* /*
* pdacf_pcm_capture_pointer - pointer callback for capture * pdacf_pcm_capture_pointer - pointer callback for capture
*/ */
static snd_pcm_uframes_t pdacf_pcm_capture_pointer(snd_pcm_substream_t *subs) static snd_pcm_uframes_t pdacf_pcm_capture_pointer(struct snd_pcm_substream *subs)
{ {
pdacf_t *chip = snd_pcm_substream_chip(subs); struct snd_pdacf *chip = snd_pcm_substream_chip(subs);
return chip->pcm_hwptr; return chip->pcm_hwptr;
} }
/* /*
* operators for PCM capture * operators for PCM capture
*/ */
static snd_pcm_ops_t pdacf_pcm_capture_ops = { static struct snd_pcm_ops pdacf_pcm_capture_ops = {
.open = pdacf_pcm_capture_open, .open = pdacf_pcm_capture_open,
.close = pdacf_pcm_capture_close, .close = pdacf_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -327,9 +327,9 @@ static snd_pcm_ops_t pdacf_pcm_capture_ops = { ...@@ -327,9 +327,9 @@ static snd_pcm_ops_t pdacf_pcm_capture_ops = {
/* /*
* snd_pdacf_pcm_new - create and initialize a pcm * snd_pdacf_pcm_new - create and initialize a pcm
*/ */
int snd_pdacf_pcm_new(pdacf_t *chip) int snd_pdacf_pcm_new(struct snd_pdacf *chip)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
err = snd_pcm_new(chip->card, "PDAudioCF", 0, 0, 1, &pcm); err = snd_pcm_new(chip->card, "PDAudioCF", 0, 0, 1, &pcm);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7