Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / drivers / gpu / drm / bridge / ptn3460.c

diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/ptn3460.c
index b171901a35538d7a958e8289df8631f29ae53a47..d466696ed5e8ca00211988e3952c4d872ba2150b 100644 (file)
--- a/drivers/gpu/drm/bridge/ptn3460.c
+++ b/drivers/gpu/drm/bridge/ptn3460.c
@@ -225,12 +225,6 @@ out:
        return num_modes;
 }
 
-static int ptn3460_mode_valid(struct drm_connector *connector,
-               struct drm_display_mode *mode)
-{
-       return MODE_OK;
-}
-
 struct drm_encoder *ptn3460_best_encoder(struct drm_connector *connector)
 {
        struct ptn3460_bridge *ptn_bridge;
@@ -242,7 +236,6 @@ struct drm_encoder *ptn3460_best_encoder(struct drm_connector *connector)
 
 struct drm_connector_helper_funcs ptn3460_connector_helper_funcs = {
        .get_modes = ptn3460_get_modes,
-       .mode_valid = ptn3460_mode_valid,
        .best_encoder = ptn3460_best_encoder,
 };
 
@@ -335,7 +328,7 @@ int ptn3460_init(struct drm_device *dev, struct drm_encoder *encoder,
        }
        drm_connector_helper_add(&ptn_bridge->connector,
                        &ptn3460_connector_helper_funcs);
-       drm_sysfs_connector_add(&ptn_bridge->connector);
+       drm_connector_register(&ptn_bridge->connector);
        drm_mode_connector_attach_encoder(&ptn_bridge->connector, encoder);
 
        return 0;