Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

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

diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
index d56ff5c..6f1944b 100644 (file)
--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
@@ -92,21 +92,10 @@ static struct ch7xxx_id_struct {
        { CH7301_VID, "CH7301" },
 };
 
-struct ch7xxx_reg_state {
-    uint8_t regs[CH7xxx_NUM_REGS];
-};
-
 struct ch7xxx_priv {
        bool quiet;
-
-       struct ch7xxx_reg_state save_reg;
-       struct ch7xxx_reg_state mode_reg;
-       uint8_t save_TCTL, save_TPCP, save_TPD, save_TPVT;
-       uint8_t save_TLPF, save_TCT, save_PM, save_IDF;
 };
 
-static void ch7xxx_save(struct intel_dvo_device *dvo);
-
 static char *ch7xxx_get_id(uint8_t vid)
 {
        int i;
@@ -312,42 +301,17 @@ static void ch7xxx_dpms(struct intel_dvo_device *dvo, int mode)
 
 static void ch7xxx_dump_regs(struct intel_dvo_device *dvo)
 {
-       struct ch7xxx_priv *ch7xxx = dvo->dev_priv;
        int i;
 
        for (i = 0; i < CH7xxx_NUM_REGS; i++) {
+               uint8_t val;
                if ((i % 8) == 0 )
                        DRM_LOG_KMS("\n %02X: ", i);
-               DRM_LOG_KMS("%02X ", ch7xxx->mode_reg.regs[i]);
+               ch7xxx_readb(dvo, i, &val);
+               DRM_LOG_KMS("%02X ", val);
        }
 }
 
-static void ch7xxx_save(struct intel_dvo_device *dvo)
-{
-       struct ch7xxx_priv *ch7xxx= dvo->dev_priv;
-
-       ch7xxx_readb(dvo, CH7xxx_TCTL, &ch7xxx->save_TCTL);
-       ch7xxx_readb(dvo, CH7xxx_TPCP, &ch7xxx->save_TPCP);
-       ch7xxx_readb(dvo, CH7xxx_TPD, &ch7xxx->save_TPD);
-       ch7xxx_readb(dvo, CH7xxx_TPVT, &ch7xxx->save_TPVT);
-       ch7xxx_readb(dvo, CH7xxx_TLPF, &ch7xxx->save_TLPF);
-       ch7xxx_readb(dvo, CH7xxx_PM, &ch7xxx->save_PM);
-       ch7xxx_readb(dvo, CH7xxx_IDF, &ch7xxx->save_IDF);
-}
-
-static void ch7xxx_restore(struct intel_dvo_device *dvo)
-{
-       struct ch7xxx_priv *ch7xxx = dvo->dev_priv;
-
-       ch7xxx_writeb(dvo, CH7xxx_TCTL, ch7xxx->save_TCTL);
-       ch7xxx_writeb(dvo, CH7xxx_TPCP, ch7xxx->save_TPCP);
-       ch7xxx_writeb(dvo, CH7xxx_TPD, ch7xxx->save_TPD);
-       ch7xxx_writeb(dvo, CH7xxx_TPVT, ch7xxx->save_TPVT);
-       ch7xxx_writeb(dvo, CH7xxx_TLPF, ch7xxx->save_TLPF);
-       ch7xxx_writeb(dvo, CH7xxx_IDF, ch7xxx->save_IDF);
-       ch7xxx_writeb(dvo, CH7xxx_PM, ch7xxx->save_PM);
-}
-
 static void ch7xxx_destroy(struct intel_dvo_device *dvo)
 {
        struct ch7xxx_priv *ch7xxx = dvo->dev_priv;
@@ -365,7 +329,5 @@ struct intel_dvo_dev_ops ch7xxx_ops = {
        .mode_set = ch7xxx_mode_set,
        .dpms = ch7xxx_dpms,
        .dump_regs = ch7xxx_dump_regs,
-       .save = ch7xxx_save,
-       .restore = ch7xxx_restore,
        .destroy = ch7xxx_destroy,
 };