--- initial
+++ final
@@ -1,98 +1,98 @@
 void oaktrail_lvds_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev) {
   struct gma_encoder *gma_encoder;
   struct gma_connector *gma_connector;
   struct drm_connector *connector;
   struct drm_encoder *encoder;
   struct drm_psb_private *dev_priv = dev->dev_private;
   struct edid *edid;
   struct i2c_adapter *i2c_adap;
   struct drm_display_mode *scan; /* *modes, *bios_mode; */
   gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
   if (!gma_encoder) return;
   gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
   if (!gma_connector) goto failed_connector;
   connector = &gma_connector->base;
   encoder = &gma_encoder->base;
   dev_priv->is_lvds_on = true;
   drm_connector_init(dev, connector, &psb_intel_lvds_connector_funcs, DRM_MODE_CONNECTOR_LVDS);
   drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs, DRM_MODE_ENCODER_LVDS, NULL);
   gma_connector_attach_encoder(gma_connector, gma_encoder);
   gma_encoder->type = INTEL_OUTPUT_LVDS;
   drm_encoder_helper_add(encoder, &oaktrail_lvds_helper_funcs);
   drm_connector_helper_add(connector, &psb_intel_lvds_connector_helper_funcs);
   connector->display_info.subpixel_order = SubPixelHorizontalRGB;
   connector->interlace_allowed = false;
   connector->doublescan_allowed = false;
   drm_object_attach_property(&connector->base, dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN);
   drm_object_attach_property(&connector->base, dev_priv->backlight_property, BRIGHTNESS_MAX_LEVEL);
   mode_dev->panel_wants_dither = false;
   if (dev_priv->has_gct) mode_dev->panel_wants_dither = (dev_priv->gct_data.Panel_Port_Control & MRST_PANEL_8TO6_DITHER_ENABLE);
   if (dev_priv->lvds_dither) mode_dev->panel_wants_dither = 1;
   /*
    * LVDS discovery:
    * 1) check for EDID on DDC
    * 2) check for VBT data
    * 3) check to see if LVDS is already on
    *    if none of the above, no panel
    * 4) make sure lid is open
    *    if closed, act like it's not there for now
    */
   edid = NULL;
   mutex_lock(&dev->mode_config.mutex);
   i2c_adap = i2c_get_adapter(dev_priv->ops->i2c_bus);
   if (i2c_adap) edid = drm_get_edid(connector, i2c_adap);
   if (edid == NULL && dev_priv->lpc_gpio_base) {
     oaktrail_lvds_i2c_init(encoder);
     if (gma_encoder->ddc_bus != NULL) {
       i2c_adap = &gma_encoder->ddc_bus->adapter;
       edid = drm_get_edid(connector, i2c_adap);
     }
   }
   /*
    * Attempt to get the fixed panel mode from DDC.  Assume that the
    * preferred mode is the right one.
    */
   if (edid) {
-    drm_mode_connector_update_edid_property(connector, edid);
+    drm_connector_update_edid_property(connector, edid);
     drm_add_edid_modes(connector, edid);
     kfree(edid);
     list_for_each_entry(scan, &connector->probed_modes, head) {
       if (scan->type & DRM_MODE_TYPE_PREFERRED) {
         mode_dev->panel_fixed_mode = drm_mode_duplicate(dev, scan);
         goto out; /* FIXME: check for quirks */
       }
     }
   } else
     dev_err(dev->dev, "No ddc adapter available!\n");
   /*
    * If we didn't get EDID, try geting panel timing
    * from configuration data
    */
   oaktrail_lvds_get_configuration_mode(dev, mode_dev);
   if (mode_dev->panel_fixed_mode) {
     mode_dev->panel_fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
     goto out; /* FIXME: check for quirks */
   }
   /* If we still don't have a mode after all that, give up. */
   if (!mode_dev->panel_fixed_mode) {
     dev_err(dev->dev, "Found no modes on the lvds, ignoring the LVDS\n");
     goto failed_find;
   }
 out:
   mutex_unlock(&dev->mode_config.mutex);
   drm_connector_register(connector);
   return;
 failed_find:
   mutex_unlock(&dev->mode_config.mutex);
   dev_dbg(dev->dev, "No LVDS modes found, disabling.\n");
   if (gma_encoder->ddc_bus) {
     psb_intel_i2c_destroy(gma_encoder->ddc_bus);
     gma_encoder->ddc_bus = NULL;
   }
   /* failed_ddc: */
   drm_encoder_cleanup(encoder);
   drm_connector_cleanup(connector);
   kfree(gma_connector);
 failed_connector:
   kfree(gma_encoder);
 }<sep>@@
expression e1,e2;
@@
-       drm_mode_connector_update_edid_property
+       drm_connector_update_edid_property
		(e1,e2)