drm: remove legacy drm_connector_property fxns

Replace references to and remove the connector property fxns, which
have been superseded with the more general object property fxns:

  + drm_connector_attach_property -> drm_object_attach_property
  + drm_connector_property_set_value -> drm_object_property_set_value
  + drm_connector_property_get_value -> drm_object_property_get_value

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

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d6d007275947a34372f1bf1c7716b8073c02e4fc..f2d667b8bee2be1134eeff0c731fab56eb39e082 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -559,11 +559,11 @@ int drm_connector_init(struct drm_device *dev,
        dev->mode_config.num_connector++;
 
        if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              dev->mode_config.edid_property,
                                              0);
 
-       drm_connector_attach_property(connector,
+       drm_object_attach_property(&connector->base,
                                      dev->mode_config.dpms_property, 0);
 
  out:
@@ -2928,27 +2928,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
 }
 EXPORT_SYMBOL(drm_property_destroy);
 
-void drm_connector_attach_property(struct drm_connector *connector,
-                              struct drm_property *property, uint64_t init_val)
-{
-       drm_object_attach_property(&connector->base, property, init_val);
-}
-EXPORT_SYMBOL(drm_connector_attach_property);
-
-int drm_connector_property_set_value(struct drm_connector *connector,
-                                 struct drm_property *property, uint64_t value)
-{
-       return drm_object_property_set_value(&connector->base, property, value);
-}
-EXPORT_SYMBOL(drm_connector_property_set_value);
-
-int drm_connector_property_get_value(struct drm_connector *connector,
-                                 struct drm_property *property, uint64_t *val)
-{
-       return drm_object_property_get_value(&connector->base, property, val);
-}
-EXPORT_SYMBOL(drm_connector_property_get_value);
-
 void drm_object_attach_property(struct drm_mode_object *obj,
                                struct drm_property *property,
                                uint64_t init_val)
@@ -3185,7 +3164,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
        /* Delete edid, when there is none. */
        if (!edid) {
                connector->edid_blob_ptr = NULL;
-               ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0);
+               ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);
                return ret;
        }
 
@@ -3195,7 +3174,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
        if (!connector->edid_blob_ptr)
                return -EINVAL;
 
-       ret = drm_connector_property_set_value(connector,
+       ret = drm_object_property_set_value(&connector->base,
                                               dev->mode_config.edid_property,
                                               connector->edid_blob_ptr->base.id);
 
@@ -3262,7 +3241,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
 
        /* store the property value if successful */
        if (!ret)
-               drm_connector_property_set_value(connector, property, value);
+               drm_object_property_set_value(&connector->base, property, value);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 05e623a5d095754823e3bc8deefa8954124f82cd..954d175bd7fac65b62568c57a0203a55870cbe2e 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -348,7 +348,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
                for (j = 0; j < fb_helper->connector_count; j++) {
                        connector = fb_helper->connector_info[j]->connector;
                        connector->funcs->dpms(connector, dpms_mode);
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                dev->mode_config.dpms_property, dpms_mode);
                }
        }

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 05cd8fe062afa1ed68cfb5d745cac13c3a285891..02296653a058a6f5dd0473ae065304bda4b3ea93 100644 (file)
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device,
        uint64_t dpms_status;
        int ret;
 
-       ret = drm_connector_property_get_value(connector,
+       ret = drm_object_property_get_value(&connector->base,
                                            dev->mode_config.dpms_property,
                                            &dpms_status);
        if (ret)
@@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device,
                return 0;
        }
 
-       ret = drm_connector_property_get_value(connector, prop, &subconnector);
+       ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
        if (ret)
                return 0;
 
@@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device,
                return 0;
        }
 
-       ret = drm_connector_property_get_value(connector, prop, &subconnector);
+       ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
        if (ret)
                return 0;
 

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index c0635b7f869690688eab644c63fdbbd89b78f2cc..ee9b0b59237f2c51bc04dcd9038da78d499092b4 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -920,12 +920,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 extern void drm_mode_connector_list_update(struct drm_connector *connector);
 extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
                                                struct edid *edid);
-extern int drm_connector_property_set_value(struct drm_connector *connector,
-                                        struct drm_property *property,
-                                        uint64_t value);
-extern int drm_connector_property_get_value(struct drm_connector *connector,
-                                        struct drm_property *property,
-                                        uint64_t *value);
 extern int drm_object_property_set_value(struct drm_mode_object *obj,
                                         struct drm_property *property,
                                         uint64_t val);
@@ -947,8 +941,6 @@ extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
 extern bool drm_crtc_in_use(struct drm_crtc *crtc);
 
-extern void drm_connector_attach_property(struct drm_connector *connector,
-                                         struct drm_property *property, uint64_t init_val);
 extern void drm_object_attach_property(struct drm_mode_object *obj,
                                       struct drm_property *property,
                                       uint64_t init_val);