aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-04-09 06:30:57 -0400
committerTakashi Iwai <tiwai@suse.de>2014-04-09 08:48:07 -0400
commit17c3ad030213da23158082ea90ebbe2a3940a2d2 (patch)
tree5d8e5d76d36d4dd86ebd20aed6b2fd8f3124716d /sound
parent137bcc33c6fd775579c7d9d266e1972f56cf5cab (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_controller.c8
-rw-r--r--sound/pci/hda/hda_controller.h2
-rw-r--r--sound/pci/hda/hda_intel.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 8197afc6cba5..248b90abb882 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1605,7 +1605,7 @@ static void azx_exit_link_reset(struct azx *chip)
1605} 1605}
1606 1606
1607/* reset codec link */ 1607/* reset codec link */
1608static int azx_reset(struct azx *chip, int full_reset) 1608static int azx_reset(struct azx *chip, bool full_reset)
1609{ 1609{
1610 if (!full_reset) 1610 if (!full_reset)
1611 goto __skip; 1611 goto __skip;
@@ -1702,7 +1702,7 @@ static void azx_int_clear(struct azx *chip)
1702/* 1702/*
1703 * reset and start the controller registers 1703 * reset and start the controller registers
1704 */ 1704 */
1705void azx_init_chip(struct azx *chip, int full_reset) 1705void azx_init_chip(struct azx *chip, bool full_reset)
1706{ 1706{
1707 if (chip->initialized) 1707 if (chip->initialized)
1708 return; 1708 return;
@@ -1842,7 +1842,7 @@ static void azx_bus_reset(struct hda_bus *bus)
1842 1842
1843 bus->in_reset = 1; 1843 bus->in_reset = 1;
1844 azx_stop_chip(chip); 1844 azx_stop_chip(chip);
1845 azx_init_chip(chip, 1); 1845 azx_init_chip(chip, true);
1846#ifdef CONFIG_PM 1846#ifdef CONFIG_PM
1847 if (chip->initialized) { 1847 if (chip->initialized) {
1848 struct azx_pcm *p; 1848 struct azx_pcm *p;
@@ -1949,7 +1949,7 @@ int azx_codec_create(struct azx *chip, const char *model,
1949 * get back to the sanity state. 1949 * get back to the sanity state.
1950 */ 1950 */
1951 azx_stop_chip(chip); 1951 azx_stop_chip(chip);
1952 azx_init_chip(chip, 1); 1952 azx_init_chip(chip, true);
1953 } 1953 }
1954 } 1954 }
1955 } 1955 }
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index 1d2e3be2bae6..baf0e77330af 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -37,7 +37,7 @@ int azx_alloc_stream_pages(struct azx *chip);
37void azx_free_stream_pages(struct azx *chip); 37void azx_free_stream_pages(struct azx *chip);
38 38
39/* Low level azx interface */ 39/* Low level azx interface */
40void azx_init_chip(struct azx *chip, int full_reset); 40void azx_init_chip(struct azx *chip, bool full_reset);
41void azx_stop_chip(struct azx *chip); 41void azx_stop_chip(struct azx *chip);
42void azx_enter_link_reset(struct azx *chip); 42void azx_enter_link_reset(struct azx *chip);
43irqreturn_t azx_interrupt(int irq, void *dev_id); 43irqreturn_t azx_interrupt(int irq, void *dev_id);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 77ca894f8284..d6bca62ef387 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -636,7 +636,7 @@ static int azx_resume(struct device *dev)
636 return -EIO; 636 return -EIO;
637 azx_init_pci(chip); 637 azx_init_pci(chip);
638 638
639 azx_init_chip(chip, 1); 639 azx_init_chip(chip, true);
640 640
641 snd_hda_resume(chip->bus); 641 snd_hda_resume(chip->bus);
642 snd_power_change_state(card, SNDRV_CTL_POWER_D0); 642 snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -689,7 +689,7 @@ static int azx_runtime_resume(struct device *dev)
689 status = azx_readw(chip, STATESTS); 689 status = azx_readw(chip, STATESTS);
690 690
691 azx_init_pci(chip); 691 azx_init_pci(chip);
692 azx_init_chip(chip, 1); 692 azx_init_chip(chip, true);
693 693
694 bus = chip->bus; 694 bus = chip->bus;
695 if (status && bus) { 695 if (status && bus) {