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
vserver 1.9.5.x5
[linux-2.6.git]
/
sound
/
isa
/
ad1848
/
ad1848_lib.c
diff --git
a/sound/isa/ad1848/ad1848_lib.c
b/sound/isa/ad1848/ad1848_lib.c
index
d0a62f7
..
97b8f87
100644
(file)
--- a/
sound/isa/ad1848/ad1848_lib.c
+++ b/
sound/isa/ad1848/ad1848_lib.c
@@
-119,9
+119,8
@@
void snd_ad1848_out(ad1848_t *chip,
#endif
}
#endif
}
-void snd_ad1848_dout(ad1848_t *chip,
- unsigned char reg,
- unsigned char value)
+static void snd_ad1848_dout(ad1848_t *chip,
+ unsigned char reg, unsigned char value)
{
int timeout;
{
int timeout;
@@
-132,7
+131,7
@@
void snd_ad1848_dout(ad1848_t *chip,
mb();
}
mb();
}
-unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
+
static
unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
{
int timeout;
{
int timeout;
@@
-147,9
+146,9
@@
unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
return inb(AD1848P(chip, REG));
}
return inb(AD1848P(chip, REG));
}
-#if
def CONFIG_SND_DEBUG
+#if
0
-void snd_ad1848_debug(ad1848_t *chip)
+
static
void snd_ad1848_debug(ad1848_t *chip)
{
printk("AD1848 REGS: INDEX = 0x%02x ", inb(AD1848P(chip, REGSEL)));
printk(" STATUS = 0x%02x\n", inb(AD1848P(chip, STATUS)));
{
printk("AD1848 REGS: INDEX = 0x%02x ", inb(AD1848P(chip, REGSEL)));
printk(" STATUS = 0x%02x\n", inb(AD1848P(chip, STATUS)));
@@
-177,7
+176,7
@@
void snd_ad1848_debug(ad1848_t *chip)
* AD1848 detection / MCE routines
*/
* AD1848 detection / MCE routines
*/
-void snd_ad1848_mce_up(ad1848_t *chip)
+
static
void snd_ad1848_mce_up(ad1848_t *chip)
{
unsigned long flags;
int timeout;
{
unsigned long flags;
int timeout;
@@
-198,7
+197,7
@@
void snd_ad1848_mce_up(ad1848_t *chip)
spin_unlock_irqrestore(&chip->reg_lock, flags);
}
spin_unlock_irqrestore(&chip->reg_lock, flags);
}
-void snd_ad1848_mce_down(ad1848_t *chip)
+
static
void snd_ad1848_mce_down(ad1848_t *chip)
{
unsigned long flags;
int timeout;
{
unsigned long flags;
int timeout;
@@
-584,7
+583,7
@@
static int snd_ad1848_capture_prepare(snd_pcm_substream_t * substream)
return 0;
}
return 0;
}
-irqreturn_t snd_ad1848_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+
static
irqreturn_t snd_ad1848_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
ad1848_t *chip = dev_id;
{
ad1848_t *chip = dev_id;
@@
-649,16
+648,12
@@
static int snd_ad1848_suspend(snd_card_t *card, unsigned int state)
{
ad1848_t *chip = card->pm_private_data;
{
ad1848_t *chip = card->pm_private_data;
- if (card->power_state == SNDRV_CTL_POWER_D3hot)
- return 0;
-
snd_pcm_suspend_all(chip->pcm);
/* FIXME: save registers? */
if (chip->thinkpad_flag)
snd_ad1848_thinkpad_twiddle(chip, 0);
snd_pcm_suspend_all(chip->pcm);
/* FIXME: save registers? */
if (chip->thinkpad_flag)
snd_ad1848_thinkpad_twiddle(chip, 0);
- snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
return 0;
}
@@
-666,15
+661,11
@@
static int snd_ad1848_resume(snd_card_t *card, unsigned int state)
{
ad1848_t *chip = card->pm_private_data;
{
ad1848_t *chip = card->pm_private_data;
- if (card->power_state == SNDRV_CTL_POWER_D0)
- return 0;
-
if (chip->thinkpad_flag)
snd_ad1848_thinkpad_twiddle(chip, 1);
/* FIXME: restore registers? */
if (chip->thinkpad_flag)
snd_ad1848_thinkpad_twiddle(chip, 1);
/* FIXME: restore registers? */
- snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}
#endif /* CONFIG_PM */
return 0;
}
#endif /* CONFIG_PM */
@@
-1264,12
+1255,7
@@
int snd_ad1848_mixer(ad1848_t *chip)
return 0;
}
return 0;
}
-EXPORT_SYMBOL(snd_ad1848_in);
EXPORT_SYMBOL(snd_ad1848_out);
EXPORT_SYMBOL(snd_ad1848_out);
-EXPORT_SYMBOL(snd_ad1848_dout);
-EXPORT_SYMBOL(snd_ad1848_mce_up);
-EXPORT_SYMBOL(snd_ad1848_mce_down);
-EXPORT_SYMBOL(snd_ad1848_interrupt);
EXPORT_SYMBOL(snd_ad1848_create);
EXPORT_SYMBOL(snd_ad1848_pcm);
EXPORT_SYMBOL(snd_ad1848_get_pcm_ops);
EXPORT_SYMBOL(snd_ad1848_create);
EXPORT_SYMBOL(snd_ad1848_pcm);
EXPORT_SYMBOL(snd_ad1848_get_pcm_ops);