Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / drivers / gpu / drm / i915 / dvo_tfp410.c

diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
index c7c391b..66c697b 100644 (file)
--- a/drivers/gpu/drm/i915/dvo_tfp410.c
+++ b/drivers/gpu/drm/i915/dvo_tfp410.c
@@ -86,16 +86,8 @@
 #define TFP410_V_RES_LO                0x3C
 #define TFP410_V_RES_HI                0x3D
 
-struct tfp410_save_rec {
-       uint8_t ctl1;
-       uint8_t ctl2;
-};
-
 struct tfp410_priv {
        bool quiet;
-
-       struct tfp410_save_rec saved_reg;
-       struct tfp410_save_rec mode_reg;
 };
 
 static bool tfp410_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
@@ -293,28 +285,6 @@ static void tfp410_dump_regs(struct intel_dvo_device *dvo)
        DRM_LOG_KMS("TFP410_V_RES: 0x%02X%02X\n", val2, val);
 }
 
-static void tfp410_save(struct intel_dvo_device *dvo)
-{
-       struct tfp410_priv *tfp = dvo->dev_priv;
-
-       if (!tfp410_readb(dvo, TFP410_CTL_1, &tfp->saved_reg.ctl1))
-               return;
-
-       if (!tfp410_readb(dvo, TFP410_CTL_2, &tfp->saved_reg.ctl2))
-               return;
-}
-
-static void tfp410_restore(struct intel_dvo_device *dvo)
-{
-       struct tfp410_priv *tfp = dvo->dev_priv;
-
-       /* Restore it powered down initially */
-       tfp410_writeb(dvo, TFP410_CTL_1, tfp->saved_reg.ctl1 & ~0x1);
-
-       tfp410_writeb(dvo, TFP410_CTL_2, tfp->saved_reg.ctl2);
-       tfp410_writeb(dvo, TFP410_CTL_1, tfp->saved_reg.ctl1);
-}
-
 static void tfp410_destroy(struct intel_dvo_device *dvo)
 {
        struct tfp410_priv *tfp = dvo->dev_priv;
@@ -332,7 +302,5 @@ struct intel_dvo_dev_ops tfp410_ops = {
        .mode_set = tfp410_mode_set,
        .dpms = tfp410_dpms,
        .dump_regs = tfp410_dump_regs,
-       .save = tfp410_save,
-       .restore = tfp410_restore,
        .destroy = tfp410_destroy,
 };