git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pcmcia
/
pdaudiocf
/
pdaudiocf_core.c
diff --git
a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index
a2132e3
..
bd0d70f
100644
(file)
--- a/
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@
-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 flags;
unsigned char res;
unsigned long timeout;
unsigned long flags;
unsigned char res;
@@
-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 flags;
unsigned long timeout;
unsigned long flags;
@@
-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("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP));
{
printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port);
printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP));
@@
-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)
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);
if (resume)
{
pdacf_reset(chip, 0);
if (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(s
nd_info_entry_t
* entry,
- s
nd_info_buffer_t *
buffer)
+static void pdacf_proc_read(s
truct snd_info_entry
* entry,
+ s
truct snd_info_buffer *
buffer)
{
{
-
pdacf_t
*chip = entry->private_data;
+
struct snd_pdacf
*chip = entry->private_data;
u16 tmp;
snd_iprintf(buffer, "PDAudioCF\n\n");
u16 tmp;
snd_iprintf(buffer, "PDAudioCF\n\n");
@@
-139,19
+139,19
@@
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)
{
{
- s
nd_info_entry_t
*entry;
+ s
truct snd_info_entry
*entry;
if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry))
snd_info_set_text_ops(entry, chip, 1024, pdacf_proc_read);
}
if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry))
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 = k
calloc(1,
sizeof(*chip), GFP_KERNEL);
+ chip = k
zalloc(
sizeof(*chip), GFP_KERNEL);
if (chip == NULL)
return NULL;
chip->card = card;
if (chip == NULL)
return NULL;
chip->card = 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;
u16 val;
unsigned long flags;
u16 val;
@@
-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;
u16 val;
{
int err;
u16 val;
@@
-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,11
+255,11
@@
void snd_pdacf_powerdown(pdacf_t *chip)
#ifdef CONFIG_PM
#ifdef CONFIG_PM
-int snd_pdacf_suspend(s
nd_card_t *card
, pm_message_t state)
+int snd_pdacf_suspend(s
truct snd_pdacf *chip
, pm_message_t state)
{
{
- pdacf_t *chip = card->pm_private_data;
u16 val;
u16 val;
+ snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
snd_pcm_suspend_all(chip->pcm);
/* disable interrupts, but use direct write to preserve old register value in chip->regmap */
val = inw(chip->port + PDAUDIOCF_REG_IER);
snd_pcm_suspend_all(chip->pcm);
/* disable interrupts, but use direct write to preserve old register value in chip->regmap */
val = inw(chip->port + PDAUDIOCF_REG_IER);
@@
-270,14
+270,13
@@
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(s
nd_card_t *card
)
+int snd_pdacf_resume(s
truct snd_pdacf *chip
)
{
{
- pdacf_t *chip = card->pm_private_data;
int timeout = 40;
pdacf_reinit(chip, 1);
int timeout = 40;
pdacf_reinit(chip, 1);
@@
-286,6
+285,7
@@
int snd_pdacf_resume(snd_card_t *card)
(snd_ak4117_external_rate(chip->ak4117) <= 0 || !check_signal(chip)))
mdelay(1);
chip->chip_status &= ~PDAUDIOCF_STAT_IS_SUSPENDED;
(snd_ak4117_external_rate(chip->ak4117) <= 0 || !check_signal(chip)))
mdelay(1);
chip->chip_status &= ~PDAUDIOCF_STAT_IS_SUSPENDED;
+ snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
return 0;
}
#endif
return 0;
}
#endif