diff options
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 60890bfecc19..dd798c3196ff 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -558,24 +558,12 @@ static int conexant_build_controls(struct hda_codec *codec) | |||
| 558 | return 0; | 558 | return 0; |
| 559 | } | 559 | } |
| 560 | 560 | ||
| 561 | #ifdef CONFIG_PM | ||
| 562 | static int conexant_suspend(struct hda_codec *codec) | ||
| 563 | { | ||
| 564 | snd_hda_shutup_pins(codec); | ||
| 565 | return 0; | ||
| 566 | } | ||
| 567 | #endif | ||
| 568 | |||
| 569 | static const struct hda_codec_ops conexant_patch_ops = { | 561 | static const struct hda_codec_ops conexant_patch_ops = { |
| 570 | .build_controls = conexant_build_controls, | 562 | .build_controls = conexant_build_controls, |
| 571 | .build_pcms = conexant_build_pcms, | 563 | .build_pcms = conexant_build_pcms, |
| 572 | .init = conexant_init, | 564 | .init = conexant_init, |
| 573 | .free = conexant_free, | 565 | .free = conexant_free, |
| 574 | .set_power_state = conexant_set_power, | 566 | .set_power_state = conexant_set_power, |
| 575 | #ifdef CONFIG_PM | ||
| 576 | .suspend = conexant_suspend, | ||
| 577 | #endif | ||
| 578 | .reboot_notify = snd_hda_shutup_pins, | ||
| 579 | }; | 567 | }; |
| 580 | 568 | ||
| 581 | #ifdef CONFIG_SND_HDA_INPUT_BEEP | 569 | #ifdef CONFIG_SND_HDA_INPUT_BEEP |
| @@ -4405,10 +4393,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = { | |||
| 4405 | .init = cx_auto_init, | 4393 | .init = cx_auto_init, |
| 4406 | .free = conexant_free, | 4394 | .free = conexant_free, |
| 4407 | .unsol_event = snd_hda_jack_unsol_event, | 4395 | .unsol_event = snd_hda_jack_unsol_event, |
| 4408 | #ifdef CONFIG_PM | ||
| 4409 | .suspend = conexant_suspend, | ||
| 4410 | #endif | ||
| 4411 | .reboot_notify = snd_hda_shutup_pins, | ||
| 4412 | }; | 4396 | }; |
| 4413 | 4397 | ||
| 4414 | /* | 4398 | /* |
