1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index fc9292705db..a4cc777ab7a 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1694,7 +1694,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
         uint8_t cmd;
         int ret;
 
-        ret = drm_connector_property_set_value(connector, property, val);
+        ret = drm_object_property_set_value(&connector->base, property, val);
         if (ret)
                 return ret;
 
@@ -1749,7 +1749,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
         } else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) {
                 temp_value = val;
                 if (psb_intel_sdvo_connector->left == property) {
-                        drm_connector_property_set_value(connector,
+                        drm_object_property_set_value(&connector->base,
                                                          psb_intel_sdvo_connector->right, val);
                         if (psb_intel_sdvo_connector->left_margin == temp_value)
                                 return 0;
@@ -1761,7 +1761,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
                         cmd = SDVO_CMD_SET_OVERSCAN_H;
                         goto set_value;
                 } else if (psb_intel_sdvo_connector->right == property) {
-                        drm_connector_property_set_value(connector,
+                        drm_object_property_set_value(&connector->base,
                                                          psb_intel_sdvo_connector->left, val);
                         if (psb_intel_sdvo_connector->right_margin == temp_value)
                                 return 0;
@@ -1773,7 +1773,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
                         cmd = SDVO_CMD_SET_OVERSCAN_H;
                         goto set_value;
                 } else if (psb_intel_sdvo_connector->top == property) {
-                        drm_connector_property_set_value(connector,
+                        drm_object_property_set_value(&connector->base,
                                                          psb_intel_sdvo_connector->bottom, val);
                         if (psb_intel_sdvo_connector->top_margin == temp_value)
                                 return 0;
@@ -1785,7 +1785,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
                         cmd = SDVO_CMD_SET_OVERSCAN_V;
                         goto set_value;
                 } else if (psb_intel_sdvo_connector->bottom == property) {
-                        drm_connector_property_set_value(connector,
+                        drm_object_property_set_value(&connector->base,
                                                          psb_intel_sdvo_connector->top, val);
                         if (psb_intel_sdvo_connector->bottom_margin == temp_value)
                                 return 0;
@@ -2286,7 +2286,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
                                 i, tv_format_names[psb_intel_sdvo_connector->tv_format_supported[i]]);
 
         psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[0];
-        drm_connector_attach_property(&psb_intel_sdvo_connector->base.base,
+        drm_object_attach_property(&psb_intel_sdvo_connector->base.base.base,
                                       psb_intel_sdvo_connector->tv_format, 0);
         return true;
 
@@ -2302,7 +2302,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
                 psb_intel_sdvo_connector->name = \
                         drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
                 if (!psb_intel_sdvo_connector->name) return false; \
-                drm_connector_attach_property(connector, \
+                drm_object_attach_property(&connector->base, \
                                               psb_intel_sdvo_connector->name, \
                                               psb_intel_sdvo_connector->cur_##name); \
                 DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
@@ -2339,7 +2339,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 if (!psb_intel_sdvo_connector->left)
                         return false;
 
-                drm_connector_attach_property(connector,
+                drm_object_attach_property(&connector->base,
                                               psb_intel_sdvo_connector->left,
                                               psb_intel_sdvo_connector->left_margin);
 
@@ -2348,7 +2348,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 if (!psb_intel_sdvo_connector->right)
                         return false;
 
-                drm_connector_attach_property(connector,
+                drm_object_attach_property(&connector->base,
                                               psb_intel_sdvo_connector->right,
                                               psb_intel_sdvo_connector->right_margin);
                 DRM_DEBUG_KMS("h_overscan: max %d, "
@@ -2375,7 +2375,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 if (!psb_intel_sdvo_connector->top)
                         return false;
 
-                drm_connector_attach_property(connector,
+                drm_object_attach_property(&connector->base,
                                               psb_intel_sdvo_connector->top,
                                               psb_intel_sdvo_connector->top_margin);
 
@@ -2384,7 +2384,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 if (!psb_intel_sdvo_connector->bottom)
                         return false;
 
-                drm_connector_attach_property(connector,
+                drm_object_attach_property(&connector->base,
                                               psb_intel_sdvo_connector->bottom,
                                               psb_intel_sdvo_connector->bottom_margin);
                 DRM_DEBUG_KMS("v_overscan: max %d, "
@@ -2416,7 +2416,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
                 if (!psb_intel_sdvo_connector->dot_crawl)
                         return false;
 
-                drm_connector_attach_property(connector,
+                drm_object_attach_property(&connector->base,
                                               psb_intel_sdvo_connector->dot_crawl,
                                               psb_intel_sdvo_connector->cur_dot_crawl);
                 DRM_DEBUG_KMS("dot crawl: current %d\n", response);