Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 17c3ad030213da23158082ea90ebbe2a3940a2d2

Authored by Thierry Reding
Committed by Takashi Iwai
1 parent 137bcc33c6
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 3 changed files with 7 additions and 7 deletions Side-by-side Diff

sound/pci/hda/hda_controller.c
Diff comments   View file @ 17c3ad0
... ... @@ -1605,7 +1605,7 @@
1605 1605 }
1606 1606  
1607 1607 /* reset codec link */
1608   -static int azx_reset(struct azx *chip, int full_reset)
  1608 +static int azx_reset(struct azx *chip, bool full_reset)
1609 1609 {
1610 1610 if (!full_reset)
1611 1611 goto __skip;
... ... @@ -1702,7 +1702,7 @@
1702 1702 /*
1703 1703 * reset and start the controller registers
1704 1704 */
1705   -void azx_init_chip(struct azx *chip, int full_reset)
  1705 +void azx_init_chip(struct azx *chip, bool full_reset)
1706 1706 {
1707 1707 if (chip->initialized)
1708 1708 return;
... ... @@ -1842,7 +1842,7 @@
1842 1842  
1843 1843 bus->in_reset = 1;
1844 1844 azx_stop_chip(chip);
1845   - azx_init_chip(chip, 1);
  1845 + azx_init_chip(chip, true);
1846 1846 #ifdef CONFIG_PM
1847 1847 if (chip->initialized) {
1848 1848 struct azx_pcm *p;
... ... @@ -1949,7 +1949,7 @@
1949 1949 * get back to the sanity state.
1950 1950 */
1951 1951 azx_stop_chip(chip);
1952   - azx_init_chip(chip, 1);
  1952 + azx_init_chip(chip, true);
1953 1953 }
1954 1954 }
1955 1955 }
sound/pci/hda/hda_controller.h
Diff comments   View file @ 17c3ad0
... ... @@ -37,7 +37,7 @@
37 37 void azx_free_stream_pages(struct azx *chip);
38 38  
39 39 /* Low level azx interface */
40   -void azx_init_chip(struct azx *chip, int full_reset);
  40 +void azx_init_chip(struct azx *chip, bool full_reset);
41 41 void azx_stop_chip(struct azx *chip);
42 42 void azx_enter_link_reset(struct azx *chip);
43 43 irqreturn_t azx_interrupt(int irq, void *dev_id);
sound/pci/hda/hda_intel.c
Diff comments   View file @ 17c3ad0
... ... @@ -636,7 +636,7 @@
636 636 return -EIO;
637 637 azx_init_pci(chip);
638 638  
639   - azx_init_chip(chip, 1);
  639 + azx_init_chip(chip, true);
640 640  
641 641 snd_hda_resume(chip->bus);
642 642 snd_power_change_state(card, SNDRV_CTL_POWER_D0);
... ... @@ -689,7 +689,7 @@
689 689 status = azx_readw(chip, STATESTS);
690 690  
691 691 azx_init_pci(chip);
692   - azx_init_chip(chip, 1);
  692 + azx_init_chip(chip, true);
693 693  
694 694 bus = chip->bus;
695 695 if (status && bus) {