mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-07 15:18:15 +00:00
ALSA: hda - Make full_reset boolean
The full_reset argument to azx_init_chip() carries boolean rather than numerical information, so update the type to reflect that. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
137bcc33c6
commit
17c3ad0302
3 changed files with 7 additions and 7 deletions
|
@ -1605,7 +1605,7 @@ static void azx_exit_link_reset(struct azx *chip)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* reset codec link */
|
/* reset codec link */
|
||||||
static int azx_reset(struct azx *chip, int full_reset)
|
static int azx_reset(struct azx *chip, bool full_reset)
|
||||||
{
|
{
|
||||||
if (!full_reset)
|
if (!full_reset)
|
||||||
goto __skip;
|
goto __skip;
|
||||||
|
@ -1702,7 +1702,7 @@ static void azx_int_clear(struct azx *chip)
|
||||||
/*
|
/*
|
||||||
* reset and start the controller registers
|
* reset and start the controller registers
|
||||||
*/
|
*/
|
||||||
void azx_init_chip(struct azx *chip, int full_reset)
|
void azx_init_chip(struct azx *chip, bool full_reset)
|
||||||
{
|
{
|
||||||
if (chip->initialized)
|
if (chip->initialized)
|
||||||
return;
|
return;
|
||||||
|
@ -1842,7 +1842,7 @@ static void azx_bus_reset(struct hda_bus *bus)
|
||||||
|
|
||||||
bus->in_reset = 1;
|
bus->in_reset = 1;
|
||||||
azx_stop_chip(chip);
|
azx_stop_chip(chip);
|
||||||
azx_init_chip(chip, 1);
|
azx_init_chip(chip, true);
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
if (chip->initialized) {
|
if (chip->initialized) {
|
||||||
struct azx_pcm *p;
|
struct azx_pcm *p;
|
||||||
|
@ -1949,7 +1949,7 @@ int azx_codec_create(struct azx *chip, const char *model,
|
||||||
* get back to the sanity state.
|
* get back to the sanity state.
|
||||||
*/
|
*/
|
||||||
azx_stop_chip(chip);
|
azx_stop_chip(chip);
|
||||||
azx_init_chip(chip, 1);
|
azx_init_chip(chip, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ int azx_alloc_stream_pages(struct azx *chip);
|
||||||
void azx_free_stream_pages(struct azx *chip);
|
void azx_free_stream_pages(struct azx *chip);
|
||||||
|
|
||||||
/* Low level azx interface */
|
/* Low level azx interface */
|
||||||
void azx_init_chip(struct azx *chip, int full_reset);
|
void azx_init_chip(struct azx *chip, bool full_reset);
|
||||||
void azx_stop_chip(struct azx *chip);
|
void azx_stop_chip(struct azx *chip);
|
||||||
void azx_enter_link_reset(struct azx *chip);
|
void azx_enter_link_reset(struct azx *chip);
|
||||||
irqreturn_t azx_interrupt(int irq, void *dev_id);
|
irqreturn_t azx_interrupt(int irq, void *dev_id);
|
||||||
|
|
|
@ -636,7 +636,7 @@ static int azx_resume(struct device *dev)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
azx_init_pci(chip);
|
azx_init_pci(chip);
|
||||||
|
|
||||||
azx_init_chip(chip, 1);
|
azx_init_chip(chip, true);
|
||||||
|
|
||||||
snd_hda_resume(chip->bus);
|
snd_hda_resume(chip->bus);
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|
||||||
|
@ -689,7 +689,7 @@ static int azx_runtime_resume(struct device *dev)
|
||||||
status = azx_readw(chip, STATESTS);
|
status = azx_readw(chip, STATESTS);
|
||||||
|
|
||||||
azx_init_pci(chip);
|
azx_init_pci(chip);
|
||||||
azx_init_chip(chip, 1);
|
azx_init_chip(chip, true);
|
||||||
|
|
||||||
bus = chip->bus;
|
bus = chip->bus;
|
||||||
if (status && bus) {
|
if (status && bus) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue