diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-10 02:48:57 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-10 02:49:50 -0400 |
commit | 6fce61aeaf0dc1dfa306092539397ab903a9afc4 (patch) | |
tree | 99c11ca45fd501621a90bd77f89a6b55859c59d6 | |
parent | 443e26d014c242623dd70cda054cc6e5ebf7993d (diff) |
ALSA: hda - Fix coding style issues in last two patches
Also re-ordered the quirk entries per SSID.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index d119feed42c9..72c87aa20bd9 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -1853,12 +1853,12 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | |||
1853 | "HP dv4-7", STAC_HP_DV5), | 1853 | "HP dv4-7", STAC_HP_DV5), |
1854 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600, | 1854 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600, |
1855 | "HP dv4-7", STAC_HP_DV5), | 1855 | "HP dv4-7", STAC_HP_DV5), |
1856 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610, | ||
1857 | "HP HDX", STAC_HP_HDX), /* HDX18 */ | ||
1856 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a, | 1858 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a, |
1857 | "HP mini 1000", STAC_HP_M4), | 1859 | "HP mini 1000", STAC_HP_M4), |
1858 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b, | 1860 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b, |
1859 | "HP HDX", STAC_HP_HDX), /* HDX16 */ | 1861 | "HP HDX", STAC_HP_HDX), /* HDX16 */ |
1860 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610, | ||
1861 | "HP HDX", STAC_HP_HDX), /* HDX18 */ | ||
1862 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, | 1862 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, |
1863 | "unknown Dell", STAC_DELL_M4_1), | 1863 | "unknown Dell", STAC_DELL_M4_1), |
1864 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234, | 1864 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234, |
@@ -4489,20 +4489,20 @@ static int stac92xx_resume(struct hda_codec *codec) | |||
4489 | */ | 4489 | */ |
4490 | 4490 | ||
4491 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 4491 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
4492 | static int stac92xx_hp_hdx_check_power_status (struct hda_codec * codec, hda_nid_t nid) | 4492 | static int stac92xx_hp_hdx_check_power_status(struct hda_codec *codec, |
4493 | hda_nid_t nid) | ||
4493 | { | 4494 | { |
4494 | struct sigmatel_spec *spec = codec->spec; | 4495 | struct sigmatel_spec *spec = codec->spec; |
4495 | 4496 | ||
4496 | if (nid == 0x10) | 4497 | if (nid == 0x10) { |
4497 | { | 4498 | if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) & |
4498 | if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) & | ||
4499 | HDA_AMP_MUTE) | 4499 | HDA_AMP_MUTE) |
4500 | spec->gpio_data &= ~0x08; /* orange */ | 4500 | spec->gpio_data &= ~0x08; /* orange */ |
4501 | else | 4501 | else |
4502 | spec->gpio_data |= 0x08; /* white */ | 4502 | spec->gpio_data |= 0x08; /* white */ |
4503 | 4503 | ||
4504 | stac_gpio_set(codec, spec->gpio_mask, | 4504 | stac_gpio_set(codec, spec->gpio_mask, |
4505 | spec->gpio_dir, | 4505 | spec->gpio_dir, |
4506 | spec->gpio_data); | 4506 | spec->gpio_data); |
4507 | } | 4507 | } |
4508 | 4508 | ||
@@ -5185,7 +5185,7 @@ again: | |||
5185 | spec->num_dmics = 1; | 5185 | spec->num_dmics = 1; |
5186 | spec->num_dmuxes = 1; | 5186 | spec->num_dmuxes = 1; |
5187 | spec->num_smuxes = 1; | 5187 | spec->num_smuxes = 1; |
5188 | /* | 5188 | /* |
5189 | * For controlling MUTE LED on HP HDX16/HDX18 notebooks, | 5189 | * For controlling MUTE LED on HP HDX16/HDX18 notebooks, |
5190 | * the CONFIG_SND_HDA_POWER_SAVE is needed to be set. | 5190 | * the CONFIG_SND_HDA_POWER_SAVE is needed to be set. |
5191 | */ | 5191 | */ |
@@ -5196,7 +5196,7 @@ again: | |||
5196 | spec->gpio_data |= 0x08; /* set to white */ | 5196 | spec->gpio_data |= 0x08; /* set to white */ |
5197 | 5197 | ||
5198 | /* register check_power_status callback. */ | 5198 | /* register check_power_status callback. */ |
5199 | codec->patch_ops.check_power_status = | 5199 | codec->patch_ops.check_power_status = |
5200 | stac92xx_hp_hdx_check_power_status; | 5200 | stac92xx_hp_hdx_check_power_status; |
5201 | #endif | 5201 | #endif |
5202 | break; | 5202 | break; |