From 19d145f4d83593e2b04ee3c8f99ea6be1dfb0b49 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 19 Dec 2012 09:44:47 +0100
Subject: [PATCH] --- yaml --- r: 348743 b: refs/heads/master c:
 7ed4165e2d01bdbbb4c1086eb73eadf0f64cbbf0 h: refs/heads/master i:   348741:
 1ed4ef1aefbdc90d6578025169472f85a38d5c5c   348739:
 fd55c344eb96ce5841f1b8a296891262c2c8f11d   348735:
 bfcabaaa3bfb5d25c9ba0b9fbfd1d60c5a49428c v: v3

---
 [refs]                               |  2 +-
 trunk/sound/pci/hda/patch_conexant.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 9243aaf6e915..8d3362d43946 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7dab4dbbb2d1b0c903378d6bade2e4ae161804e
+refs/heads/master: 7ed4165e2d01bdbbb4c1086eb73eadf0f64cbbf0
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index 60890bfecc19..dd798c3196ff 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -558,24 +558,12 @@ static int conexant_build_controls(struct hda_codec *codec)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-static int conexant_suspend(struct hda_codec *codec)
-{
-	snd_hda_shutup_pins(codec);
-	return 0;
-}
-#endif
-
 static const struct hda_codec_ops conexant_patch_ops = {
 	.build_controls = conexant_build_controls,
 	.build_pcms = conexant_build_pcms,
 	.init = conexant_init,
 	.free = conexant_free,
 	.set_power_state = conexant_set_power,
-#ifdef CONFIG_PM
-	.suspend = conexant_suspend,
-#endif
-	.reboot_notify = snd_hda_shutup_pins,
 };
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
@@ -4405,10 +4393,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
 	.init = cx_auto_init,
 	.free = conexant_free,
 	.unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
-	.suspend = conexant_suspend,
-#endif
-	.reboot_notify = snd_hda_shutup_pins,
 };
 
 /*