drm/gma500: drm_connector_property -> drm_object_property

Signed-off-by: Rob Clark <rob@ti.com>

10 files changed, 39 insertions, 39 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 1ceca3d13b6..23e14e93991 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -523,7 +523,7 @@ void cdv_intel_attach_force_audio_property(struct drm_connector *connector)
 
                 dev_priv->force_audio_property = prop;
         }
-        drm_connector_attach_property(connector, prop, 0);
+        drm_object_attach_property(&connector->base, prop, 0);
 }
 
 
@@ -553,7 +553,7 @@ void cdv_intel_attach_broadcast_rgb_property(struct drm_connector *connector)
                 dev_priv->broadcast_rgb_property = prop;
         }
 
-        drm_connector_attach_property(connector, prop, 0);
+        drm_object_attach_property(&connector->base, prop, 0);
 }
 
 /* Cedarview */
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index e3a3978cf32..51044cc55cf 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1650,7 +1650,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector,
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         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;
 
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 7272a461edf..e223b500022 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -185,14 +185,14 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,
                         return -1;
                 }
 
-                if (drm_connector_property_get_value(connector,
+                if (drm_object_property_get_value(&connector->base,
                                                         property, &curValue))
                         return -1;
 
                 if (curValue == value)
                         return 0;
 
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property, value))
                         return -1;
 
@@ -341,7 +341,7 @@ void cdv_hdmi_init(struct drm_device *dev,
         connector->interlace_allowed = false;
         connector->doublescan_allowed = false;
 
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                       dev->mode_config.scaling_mode_property,
                                       DRM_MODE_SCALE_FULLSCREEN);
 
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index b362dd39bf5..d81dbc3368f 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -479,7 +479,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
                         return -1;
                 }
 
-                if (drm_connector_property_get_value(connector,
+                if (drm_object_property_get_value(&connector->base,
                                                      property,
                                                      &curValue))
                         return -1;
@@ -487,7 +487,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
                 if (curValue == value)
                         return 0;
 
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property,
                                                         value))
                         return -1;
@@ -502,7 +502,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
                                 return -1;
                 }
         } else if (!strcmp(property->name, "backlight") && encoder) {
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property,
                                                         value))
                         return -1;
@@ -671,10 +671,10 @@ void cdv_intel_lvds_init(struct drm_device *dev,
         connector->doublescan_allowed = false;
 
         /*Attach connector properties*/
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                       dev->mode_config.scaling_mode_property,
                                       DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                       dev_priv->backlight_property,
                                       BRIGHTNESS_MAX_LEVEL);
 
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 637dd84785e..2d4ab48f07a 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -265,13 +265,13 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
                         goto set_prop_error;
                 }
 
-                if (drm_connector_property_get_value(connector, property, &val))
+                if (drm_object_property_get_value(&connector->base, property, &val))
                         goto set_prop_error;
 
                 if (val == value)
                         goto set_prop_done;
 
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property, value))
                         goto set_prop_error;
 
@@ -296,7 +296,7 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
                         }
                 }
         } else if (!strcmp(property->name, "backlight") && encoder) {
-                if (drm_connector_property_set_value(connector, property,
+                if (drm_object_property_set_value(&connector->base, property,
                                                                         value))
                         goto set_prop_error;
                 else
@@ -572,10 +572,10 @@ void mdfld_dsi_output_init(struct drm_device *dev,
         connector->doublescan_allowed = false;
 
         /*attach properties*/
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                 dev->mode_config.scaling_mode_property,
                                 DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                 dev_priv->backlight_property,
                                 MDFLD_DSI_BRIGHTNESS_MAX_LEVEL);
 
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index dec6a9aea3c..74485dc4394 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -820,7 +820,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
         REG_WRITE(map->pos, 0);
 
         if (psb_intel_encoder)
-                drm_connector_property_get_value(connector,
+                drm_object_property_get_value(&connector->base,
                         dev->mode_config.scaling_mode_property, &scalingType);
 
         if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 4ec2962f763..3071526bc3c 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -351,7 +351,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
                   (mode->crtc_vdisplay - 1));
 
         if (psb_intel_encoder)
-                drm_connector_property_get_value(connector,
+                drm_object_property_get_value(&connector->base,
                         dev->mode_config.scaling_mode_property, &scalingType);
 
         if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 558c77fb55e..325013a9c48 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -133,8 +133,8 @@ static void oaktrail_lvds_mode_set(struct drm_encoder *encoder,
                 return;
         }
 
-        drm_connector_property_get_value(
-                connector,
+        drm_object_property_get_value(
+                &connector->base,
                 dev->mode_config.scaling_mode_property,
                 &v);
 
@@ -363,10 +363,10 @@ void oaktrail_lvds_init(struct drm_device *dev,
         connector->interlace_allowed = false;
         connector->doublescan_allowed = false;
 
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                         dev->mode_config.scaling_mode_property,
                                         DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                         dev_priv->backlight_property,
                                         BRIGHTNESS_MAX_LEVEL);
 
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 2a4c3a9e33e..9fa5fa2e619 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -603,7 +603,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
                         goto set_prop_error;
                 }
 
-                if (drm_connector_property_get_value(connector,
+                if (drm_object_property_get_value(&connector->base,
                                                      property,
                                                      &curval))
                         goto set_prop_error;
@@ -611,7 +611,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
                 if (curval == value)
                         goto set_prop_done;
 
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property,
                                                         value))
                         goto set_prop_error;
@@ -626,7 +626,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
                                 goto set_prop_error;
                 }
         } else if (!strcmp(property->name, "backlight")) {
-                if (drm_connector_property_set_value(connector,
+                if (drm_object_property_set_value(&connector->base,
                                                         property,
                                                         value))
                         goto set_prop_error;
@@ -746,10 +746,10 @@ void psb_intel_lvds_init(struct drm_device *dev,
         connector->doublescan_allowed = false;
 
         /*Attach connector properties*/
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                       dev->mode_config.scaling_mode_property,
                                       DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
+        drm_object_attach_property(&connector->base,
                                       dev_priv->backlight_property,
                                       BRIGHTNESS_MAX_LEVEL);
 
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);