Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c3ad03 authored by Thierry Reding's avatar Thierry Reding Committed by Takashi Iwai
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 137bcc33

sound/pci/hda/hda_controller.c

+4 −4
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ static void azx_exit_link_reset(struct azx *chip) 
}



/* 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)

		goto __skip;
@@ -1702,7 +1702,7 @@ static void azx_int_clear(struct azx *chip) 
/*

 * 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)

		return;
@@ -1842,7 +1842,7 @@ static void azx_bus_reset(struct hda_bus *bus) 


	bus->in_reset = 1;

	azx_stop_chip(chip);

	azx_init_chip(chip, 1);

	azx_init_chip(chip, true);

#ifdef CONFIG_PM

	if (chip->initialized) {

		struct azx_pcm *p;
@@ -1949,7 +1949,7 @@ int azx_codec_create(struct azx *chip, const char *model, 
				 * get back to the sanity state.

				 */

				azx_stop_chip(chip);

				azx_init_chip(chip, 1);

				azx_init_chip(chip, true);

			}

		}

	}

sound/pci/hda/hda_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int azx_alloc_stream_pages(struct azx *chip); 
void azx_free_stream_pages(struct azx *chip);



/* 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_enter_link_reset(struct azx *chip);

irqreturn_t azx_interrupt(int irq, void *dev_id);

sound/pci/hda/hda_intel.c

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int azx_resume(struct device *dev) 
		return -EIO;

	azx_init_pci(chip);



	azx_init_chip(chip, 1);

	azx_init_chip(chip, true);



	snd_hda_resume(chip->bus);

	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);



	azx_init_pci(chip);

	azx_init_chip(chip, 1);

	azx_init_chip(chip, true);



	bus = chip->bus;

	if (status && bus) {