drm: drop _mode_ from drm_mode_connector_attach_encoder

Again to align with the usual prefix of just drm_connector_. Again
done with sed + manual fixup for indent issues.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-7-daniel.vetter@ffwll.ch

diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
index 514939433004a3d5b718da21b2cf50c9406b3048..58eed08fbe31f9f625550b75b24ef2e8ce349215 100644 (file)
--- a/Documentation/gpu/drm-kms.rst
+++ b/Documentation/gpu/drm-kms.rst
@@ -466,7 +466,7 @@ Output discovery and initialization example
         drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
                  DRM_MODE_ENCODER_DAC);
 
-        drm_mode_connector_attach_encoder(&intel_output->base,
+        drm_connector_attach_encoder(&intel_output->base,
                           &intel_output->enc);
 
         /* Set up the DDC bus. */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
index 94138abe093b1a9415f08ab713557ebe977fc193..ae8fac34f7a59bbe6dbed55bc0f0954e3de301af 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
@@ -46,7 +46,7 @@ amdgpu_link_encoder_connector(struct drm_device *dev)
                list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                        amdgpu_encoder = to_amdgpu_encoder(encoder);
                        if (amdgpu_encoder->devices & amdgpu_connector->devices) {
-                               drm_mode_connector_attach_encoder(connector, encoder);
+                               drm_connector_attach_encoder(connector, encoder);
                                if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
                                        amdgpu_atombios_encoder_init_backlight(amdgpu_encoder, connector);
                                        adev->mode_info.bl_encoder = amdgpu_encoder;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 016f150931731044062ab657d02fdf5f9840beca..677e96a563302e2d46171148b4da667445c6cb13 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -627,7 +627,7 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
        drm_connector_register(connector);
 
        /* link them */
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index c4ab19831344c1fae37a4c28f31027268b971cb7..ae09331eed0035987b95b9e29831231222ea2ffb 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3615,7 +3615,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
                link,
                link_index);
 
-       drm_mode_connector_attach_encoder(
+       drm_connector_attach_encoder(
                &aconnector->base, &aencoder->base);
 
        drm_connector_register(&aconnector->base);

diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
index b8f6f9a5dfbe32059f3e4568640e4034fa108d8d..68629e6149909fd08d52f22e314296971a3d4618 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_sim.c
+++ b/drivers/gpu/drm/arc/arcpgu_sim.c
@@ -99,7 +99,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
                goto error_encoder_cleanup;
        }
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret < 0) {
                dev_err(drm->dev, "could not attach connector to encoder\n");
                drm_connector_unregister(connector);

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 1bb8174ad155606d24d8bf1bb864e407cba5fde8..5e77d456d9bb9434040107a69536815a270c7865 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -900,7 +900,7 @@ static int ast_connector_init(struct drm_device *dev)
        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 
        encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        ast_connector->i2c = ast_i2c_create(dev);
        if (!ast_connector->i2c)

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 233980a785912853256373fb7dd8607a6ad20b61..ca5a9afdd5cfa0a338b207888883d112a925938b 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -259,7 +259,7 @@ int bochs_kms_init(struct bochs_device *bochs)
        bochs_crtc_init(bochs->dev);
        bochs_encoder_init(bochs->dev);
        bochs_connector_init(bochs->dev);
-       drm_mode_connector_attach_encoder(&bochs->connector,
+       drm_connector_attach_encoder(&bochs->connector,
                                          &bochs->encoder);
 
        return 0;

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 1f4745953aca6017e73ed79b425f4d3f34ab7890..6437b878724a15cbc0e29e7df0808e4deef7a908 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -860,7 +860,7 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge)
        }
        drm_connector_helper_add(&adv->connector,
                                 &adv7511_connector_helper_funcs);
-       drm_mode_connector_attach_encoder(&adv->connector, bridge->encoder);
+       drm_connector_attach_encoder(&adv->connector, bridge->encoder);
 
        if (adv->type == ADV7533)
                ret = adv7533_attach_dsi(adv);

diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index 37f947dcadec0520e1e4fbdb885b3a9d81724cd0..f8433c93f4634620c177c77ac67aea70337288ec 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -1048,8 +1048,8 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
 
        anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD;
 
-       err = drm_mode_connector_attach_encoder(&anx78xx->connector,
-                                               bridge->encoder);
+       err = drm_connector_attach_encoder(&anx78xx->connector,
+                                          bridge->encoder);
        if (err) {
                DRM_ERROR("Failed to link up connector to encoder: %d\n", err);
                return err;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 288c015f7460ab88356dcc925ddee004959ce0de..d68986cea13258bed331d8d023db7b493f720e5b 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1210,7 +1210,7 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge)
 
                drm_connector_helper_add(connector,
                                         &analogix_dp_connector_helper_funcs);
-               drm_mode_connector_attach_encoder(connector, encoder);
+               drm_connector_attach_encoder(connector, encoder);
        }
 
        /*

diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index da99b8ba4ee1bf5ca5b63928be0549ab20c808fc..9b706789a3417615fa74118186318f514376da80 100644 (file)
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -122,7 +122,7 @@ static int dumb_vga_attach(struct drm_bridge *bridge)
                return ret;
        }
 
-       drm_mode_connector_attach_encoder(&vga->connector,
+       drm_connector_attach_encoder(&vga->connector,
                                          bridge->encoder);
 
        return 0;

diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index b49b543bd1f6ca444cefd0cd8bda602360ab31f4..2136c97aeb8ec9463ac1d79766448402b9664504 100644 (file)
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -241,7 +241,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge)
                return ret;
        }
 
-       ret = drm_mode_connector_attach_encoder(connector, bridge->encoder);
+       ret = drm_connector_attach_encoder(connector, bridge->encoder);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index bd5c191858cb539a57365b2bc895260c4b2ca164..a3e817abace101fecc6638b7aa58af2714dbcea3 100644 (file)
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -265,7 +265,7 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge)
        drm_connector_helper_add(&ptn_bridge->connector,
                                        &ptn3460_connector_helper_funcs);
        drm_connector_register(&ptn_bridge->connector);
-       drm_mode_connector_attach_encoder(&ptn_bridge->connector,
+       drm_connector_attach_encoder(&ptn_bridge->connector,
                                                        bridge->encoder);
 
        if (ptn_bridge->panel)

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 6d99d4a3beb36c13aac92a71cee32bc6e6c59cec..7cbaba213ef693d11c430533df45c838a56c1229 100644 (file)
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -79,7 +79,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge)
                return ret;
        }
 
-       drm_mode_connector_attach_encoder(&panel_bridge->connector,
+       drm_connector_attach_encoder(&panel_bridge->connector,
                                          bridge->encoder);
 
        ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);

diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index 81198f5e9afacf91bf2301652a2ac4671030f7cf..7334d1b62b71f800e7a7fbc0e4b121e0df2bacc2 100644 (file)
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -503,7 +503,7 @@ static int ps8622_attach(struct drm_bridge *bridge)
        drm_connector_helper_add(&ps8622->connector,
                                        &ps8622_connector_helper_funcs);
        drm_connector_register(&ps8622->connector);
-       drm_mode_connector_attach_encoder(&ps8622->connector,
+       drm_connector_attach_encoder(&ps8622->connector,
                                                        bridge->encoder);
 
        if (ps8622->panel)

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index cd331933c230c2ee2b173e2da26f1a4bd62726c1..e59a135423336bd187f0038956f06ac4574d94dc 100644 (file)
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -324,7 +324,7 @@ static int sii902x_bridge_attach(struct drm_bridge *bridge)
        else
                sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
 
-       drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder);
+       drm_connector_attach_encoder(&sii902x->connector, bridge->encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ab32aceb6f2493dcfb626cd722b256ee7d1ffdc1..5971976284bf9ddb34434485624d531313791ee3 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1974,7 +1974,7 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
        drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs,
                           DRM_MODE_CONNECTOR_HDMIA);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index ee2fd0a349b32cc22cc984f2c384c658567f4d17..8e28e738cb52dec6ee8ea7eda2d655fc7035be93 100644 (file)
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1195,7 +1195,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
 
        drm_display_info_set_bus_formats(&tc->connector.display_info,
                                         &bus_format, 1);
-       drm_mode_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
+       drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index c81bf7910bbe09ac9e78b9540d6da4a7a0390b47..c3e32138c6bb08c5cdb6c75e7d6624984914e0c0 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -132,7 +132,7 @@ static int tfp410_attach(struct drm_bridge *bridge)
                return ret;
        }
 
-       drm_mode_connector_attach_encoder(&dvi->connector,
+       drm_connector_attach_encoder(&dvi->connector,
                                          bridge->encoder);
 
        return 0;

diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index b529f8c8e2a6346d0c4073a95e9644497ed2bce8..336bfda401257f60a17bfa350529e4dc3555b9f9 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -530,7 +530,7 @@ int cirrus_modeset_init(struct cirrus_device *cdev)
                return -1;
        }
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        ret = cirrus_fbdev_init(cdev);
        if (ret) {

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index b2b182ffdbe932404b905636797ab91430925011..8997792e2e239690d70cd947e2d2da2ec82dff45 100644 (file)
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -48,7 +48,7 @@
  *
  * Connectors must be attached to an encoder to be used. For devices that map
  * connectors to encoders 1:1, the connector should be attached at
- * initialization time with a call to drm_mode_connector_attach_encoder(). The
+ * initialization time with a call to drm_connector_attach_encoder(). The
  * driver must also set the &drm_connector.encoder field to point to the
  * attached encoder.
  *
@@ -291,7 +291,7 @@ out_put:
 EXPORT_SYMBOL(drm_connector_init);
 
 /**
- * drm_mode_connector_attach_encoder - attach a connector to an encoder
+ * drm_connector_attach_encoder - attach a connector to an encoder
  * @connector: connector to attach
  * @encoder: encoder to attach @connector to
  *
@@ -302,8 +302,8 @@ EXPORT_SYMBOL(drm_connector_init);
  * Returns:
  * Zero on success, negative errno on failure.
  */
-int drm_mode_connector_attach_encoder(struct drm_connector *connector,
-                                     struct drm_encoder *encoder)
+int drm_connector_attach_encoder(struct drm_connector *connector,
+                                struct drm_encoder *encoder)
 {
        int i;
 
@@ -329,7 +329,7 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector,
        }
        return -ENOMEM;
 }
-EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
+EXPORT_SYMBOL(drm_connector_attach_encoder);
 
 /**
  * drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other

diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
index b72fcf1e9605c6bca189019c7f06ed24ef3a2104..51fa978f0d236821ac020b16144f50e2fbb854bb 100644 (file)
--- a/drivers/gpu/drm/drm_simple_kms_helper.c
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@ -287,7 +287,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,
        if (ret || !connector)
                return ret;
 
-       return drm_mode_connector_attach_encoder(connector, encoder);
+       return drm_connector_attach_encoder(connector, encoder);
 }
 EXPORT_SYMBOL(drm_simple_display_pipe_init);
 

diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index 69e7a63cfcc3191fc92cdd8573ae9c96144a8302..169746f6b5677b5534f83b7e35233c7cccefd83c 100644 (file)
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -202,7 +202,7 @@ int drm_writeback_connector_init(struct drm_device *dev,
        if (ret)
                goto connector_fail;
 
-       ret = drm_mode_connector_attach_encoder(connector,
+       ret = drm_connector_attach_encoder(connector,
                                                &wb_connector->encoder);
        if (ret)
                goto attach_fail;

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 5887e8522b700c0f9af58796321badd4c321b345..2f0babb67c5104be6f1e617d5baa57a64d74499c 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -113,7 +113,7 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder)
        }
 
        drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 809e1e0447dfeae05db6386893f306b0ca1291e2..a1ed6146a3b5c476db81c4440b04d6a392b33617 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1479,7 +1479,7 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
 
        connector->status = connector_status_disconnected;
        drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index dfea61edba4a507c27560469347d8144e5d4ed52..19697c1362d8facf536a55485c45b2b2aaae6a85 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -344,7 +344,7 @@ static int vidi_create_connector(struct drm_encoder *encoder)
        }
 
        drm_connector_helper_add(connector, &vidi_connector_helper_funcs);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 6672d0ff0423a0e9f08fb39ca07cbce502fdecea..3a11c719a58087a054c43076f432bcbe54656bb6 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -951,7 +951,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
        }
 
        drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        if (hdata->bridge) {
                ret = drm_bridge_attach(encoder, hdata->bridge, NULL);

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index 681e2a07d03be788bd9508b201cdee795dcc4d8d..2298ed2a9e1c02f8e3c37d7f6761a23f0a470ca3 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -117,7 +117,7 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
        if (ret < 0)
                goto err_cleanup;
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret < 0)
                goto err_sysfs;
 

diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 08f17f85b801df22633f74e8d6b9b106b9482983..09c1161a7ac635ebbfc9f4c80a9824b43286aead 100644 (file)
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -665,7 +665,7 @@ void gma_connector_attach_encoder(struct gma_connector *connector,
                                  struct gma_encoder *encoder)
 {
        connector->encoder = encoder;
-       drm_mode_connector_attach_encoder(&connector->base,
+       drm_connector_attach_encoder(&connector->base,
                                          &encoder->base);
 }
 

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
index a05c020602bda439b03fabdae42781d3dc627385..d0bf5a1e94e8751b187538822c463447a432565f 100644 (file)
--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
@@ -999,7 +999,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
                                p_funcs->encoder_helper_funcs);
 
        /*attach to given connector*/
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        /*set possible crtcs and clones*/
        if (dsi_connector->pipe) {

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index d2f4749ebf8dcf1fe0e685f7d756859a8883d249..744956cea7496afd8ec2672bd953eaf67ef661c3 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -133,7 +133,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
        }
 
        drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index d434f576e6b299d137136796e8ad0337243e7818..eecdc327b9f880062922351efa8487b82db41c91 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1301,7 +1301,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
        if (ret)
                return ret;
 
-       drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
+       drm_connector_attach_encoder(&priv->connector, &priv->encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 694a4703042feac8e2508b433ae69126f386af4f..fbe5a6572d7d25a47f012153178d8450f3267ca7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15899,8 +15899,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
                                    struct intel_encoder *encoder)
 {
        connector->encoder = encoder;
-       drm_mode_connector_attach_encoder(&connector->base,
-                                         &encoder->base);
+       drm_connector_attach_encoder(&connector->base, &encoder->base);
 }
 
 /*

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 0f012fbe34ebd6b105b0e4461924c31ddad914b7..364330fc5d6a75830bafa9433348d069c61940ae 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -466,8 +466,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
                struct drm_encoder *enc =
                        &intel_dp->mst_encoders[pipe]->base.base;
 
-               ret = drm_mode_connector_attach_encoder(&intel_connector->base,
-                                                       enc);
+               ret = drm_connector_attach_encoder(&intel_connector->base, enc);
                if (ret)
                        goto err;
        }

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index ae81cbb75f5159aa8a4b516ed0fed779722ddf6a..7312beb6f1fcc4f07a720652f2c1ce20fffe6388 100644 (file)
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -471,8 +471,7 @@ static int imx_ldb_register(struct drm_device *drm,
                drm_connector_init(drm, &imx_ldb_ch->connector,
                                &imx_ldb_connector_funcs,
                                DRM_MODE_CONNECTOR_LVDS);
-               drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
-                               encoder);
+               drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
        }
 
        if (imx_ldb_ch->panel) {

diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 1a4ced5c09b5597d58c66a53f4b9e69fb287a733..cffd3310240e5ddec86f13a2cce9b456d0c29d1f 100644 (file)
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -493,7 +493,7 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
        drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs,
                           DRM_MODE_CONNECTOR_VGA);
 
-       drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder);
+       drm_connector_attach_encoder(&tve->connector, &tve->encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 4fc1cf583435d17e77d1d8c864704c8626f8eeda..aefd04e18f935037d3694a653b9cefb25540916c 100644 (file)
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -197,7 +197,7 @@ static int imx_pd_register(struct drm_device *drm,
                        return ret;
                }
        } else {
-               drm_mode_connector_attach_encoder(&imxpd->connector, encoder);
+               drm_connector_attach_encoder(&imxpd->connector, encoder);
        }
 
        return 0;

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index aa0943ec32b00d88260aad3b52a844d829ed1bb4..66df1b1779592195e38fe0437874c39241a2f297 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -782,7 +782,7 @@ static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi)
        drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs);
 
        dsi->conn.dpms = DRM_MODE_DPMS_OFF;
-       drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder);
+       drm_connector_attach_encoder(&dsi->conn, &dsi->encoder);
 
        if (dsi->panel) {
                ret = drm_panel_attach(dsi->panel, &dsi->conn);

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 835313940395d2f390b006a39e288d7f875f379c..2d45d1dd9554a6c8cea17a3c52c8554af94a613e 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1306,7 +1306,7 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
        hdmi->conn.interlace_allowed = true;
        hdmi->conn.doublescan_allowed = false;
 
-       ret = drm_mode_connector_attach_encoder(&hdmi->conn,
+       ret = drm_connector_attach_encoder(&hdmi->conn,
                                                bridge->encoder);
        if (ret) {
                dev_err(hdmi->dev,

diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
index 79d95ca8a0c099601e8dada4680320bf829f97dc..f7945bae3b4a9e74b7400b463c95984b93cabc59 100644 (file)
--- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
@@ -282,7 +282,7 @@ int meson_venc_cvbs_create(struct meson_drm *priv)
 
        encoder->possible_crtcs = BIT(0);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 5f104f1391978cef62a4b9109786342547bc2651..acf7bfe684549728644759e394119717f4d18f54 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1747,7 +1747,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
                return -1;
        }
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        ret = mgag200_fbdev_init(mdev);
        if (ret) {

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
index 32fba5664b0eefb162a689a54c77a4e9ae7c41b6..5368e621999ce6eddf0a5826c11356b0bc197421 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
@@ -132,7 +132,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev,
        connector->interlace_allowed = 0;
        connector->doublescan_allowed = 0;
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index 4beba3f7d067885b36962efe80eece2132c649f7..21e0dc51531da6ecc27176e3d141d18216861a4d 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -684,7 +684,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
        connector->interlace_allowed = 0;
        connector->doublescan_allowed = 0;
 
-       drm_mode_connector_attach_encoder(connector, msm_dsi->encoder);
+       drm_connector_attach_encoder(connector, msm_dsi->encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 0b5eac0541950ddd40e74593ab4585def32030c3..058ff92a020765ec5ee3bab752533295ff9f5aae 100644 (file)
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -134,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)
        connector->interlace_allowed = false;
        connector->doublescan_allowed = false;
 
-       drm_mode_connector_attach_encoder(connector, edp->encoder);
+       drm_connector_attach_encoder(connector, edp->encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 07feacc5a44148c9a4097534fdfef72a26ad2352..e9c9a0af508e8c41bc12e91fc13d2f23b5041f33 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -477,7 +477,7 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
                return ERR_PTR(ret);
        }
 
-       drm_mode_connector_attach_encoder(connector, hdmi->encoder);
+       drm_connector_attach_encoder(connector, hdmi->encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 4feab0a5419d73d4bb24e3f53ad974f884a3295e..e7af95d37ddb54488e31f92d2498066a745fc5c4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -556,6 +556,6 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index 9805d2cdc1a1d5f3b02f1422a98d0a84a41ba8f4..73d41abbb5103e2b6a4d01fc14a0a8e9df2f93f4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -716,6 +716,6 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
            entry->location != DCB_LOC_ON_CHIP)
                nv04_tmds_slave_init(encoder);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 01664357d3e18b4249348a81498e52bfd7170e4f..de4490b4ed30c80d3e26996ba6d9731869c07302 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -244,7 +244,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
 
        /* Attach it to the specified connector. */
        get_slave_funcs(encoder)->create_resources(encoder, connector);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 6d99f11fee4e0e5c65f9518b8c51f429f784bc9b..6a4ca139cf5d71efb67427dd2f79eb886482d817 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -821,6 +821,6 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry)
        encoder->possible_clones = 0;
 
        nv17_tv_create_resources(encoder, connector);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 2fabb69e452b0c2ffac78012ad08221e36929ca3..475456c19b765d52b75e20ed1e51f2f6a0f20fa3 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -424,7 +424,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
                         "dac-%04x-%04x", dcbe->hasht, dcbe->hashm);
        drm_encoder_helper_add(encoder, &nv50_dac_help);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        return 0;
 }
 
@@ -927,7 +927,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
        nouveau_conn_attach_properties(&mstc->connector);
 
        for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++)
-               drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
+               drm_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
 
        drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
        drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
@@ -1418,7 +1418,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
                         "sor-%04x-%04x", dcbe->hasht, dcbe->hashm);
        drm_encoder_helper_add(encoder, &nv50_sor_help);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        if (dcbe->type == DCB_OUTPUT_DP) {
                struct nv50_disp *disp = nv50_disp(encoder->dev);
@@ -1576,7 +1576,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
                         "pior-%04x-%04x", dcbe->hasht, dcbe->hashm);
        drm_encoder_helper_add(encoder, &nv50_pior_help);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 5005ecc284d22689a0ff846c6377dcc7a95115bf..1b6601e9b10723a42a7ebbd5d73894373021e5b9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -274,7 +274,7 @@ static int omap_modeset_init(struct drm_device *dev)
                if (IS_ERR(crtc))
                        return PTR_ERR(crtc);
 
-               drm_mode_connector_attach_encoder(connector, encoder);
+               drm_connector_attach_encoder(connector, encoder);
                encoder->possible_crtcs = (1 << crtc_idx);
 
                priv->crtcs[priv->num_crtcs++] = crtc;

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 768207fbbae3d8d23e287428ccca34bcdfedbda2..0570c6826bff40911b120cb1a99e56a3db5ac421 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1086,7 +1086,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
        /* we get HPD via client monitors config */
        connector->polled = DRM_CONNECTOR_POLL_HPD;
        encoder->possible_crtcs = 1 << num_output;
-       drm_mode_connector_attach_encoder(&qxl_output->base,
+       drm_connector_attach_encoder(&qxl_output->base,
                                          &qxl_output->enc);
        drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs);
        drm_connector_helper_add(connector, &qxl_connector_helper_funcs);

diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c6ee80216cf4a71f510bf239fc4fdf6f67235f48..c341fb2a5b56246ba8e1bc842a243dc076c2976c 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -211,7 +211,7 @@ radeon_link_encoder_connector(struct drm_device *dev)
                list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                        radeon_encoder = to_radeon_encoder(encoder);
                        if (radeon_encoder->devices & radeon_connector->devices) {
-                               drm_mode_connector_attach_encoder(connector, encoder);
+                               drm_connector_attach_encoder(connector, encoder);
                                if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
                                        radeon_encoder_add_backlight(radeon_encoder, connector);
                        }

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 5d8e391e75f4201b9b9df11482ce9b075ca4b46f..4c39de3f4f0f374b3d264cd2a18a8f69a569a689 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -353,7 +353,7 @@ static int rcar_lvds_attach(struct drm_bridge *bridge)
 
        drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs);
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index a40cb2be50e13912db1508f045ab5030c4e015e7..8ad0d773dc33a63c09a8bc246b4ceb7920e10f94 100644 (file)
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
 
        drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs);
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret) {
                DRM_ERROR("failed to attach connector and encoder\n");
                goto err_free_connector;

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index 01642aaf6127333076ad1b0994c50b069f41c146..662b6cb5d3f0241271d7ed62ea4aaa9829510659 100644 (file)
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -1129,7 +1129,7 @@ static int dw_mipi_dsi_register(struct drm_device *drm,
                           &dw_mipi_dsi_atomic_connector_funcs,
                           DRM_MODE_CONNECTOR_DSI);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 510fcb33e31d5018d16f653045422352a8968f86..1c02b3e61299c800549519a9f065ac2691f665fc 100644 (file)
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -634,7 +634,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
        drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
                           DRM_MODE_CONNECTOR_HDMIA);
 
-       drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
+       drm_connector_attach_encoder(&hdmi->connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index b3f6f524b4020f21c2e518f1997d6dfa481a1cc0..456bd9f13baefdc87865e9a7404e4caa727b0b4c 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -434,7 +434,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
                drm_connector_helper_add(connector,
                                         &rockchip_lvds_connector_helper_funcs);
 
-               ret = drm_mode_connector_attach_encoder(connector, encoder);
+               ret = drm_connector_attach_encoder(connector, encoder);
                if (ret < 0) {
                        DRM_DEV_ERROR(drm_dev->dev,
                                      "failed to attach encoder: %d\n", ret);

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 40df8887fc1765e3452f5490ccf9fc242f614cbc..fc66167b064177d15c23ca1d4060fdaa6c10385d 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -675,7 +675,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
        if (ret < 0)
                goto err_cleanup;
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret < 0)
                goto err_backlight;
 

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index 030da55a8d3011e3150be1da4da3b67712f275ba..b08376b7611b896fbcb8fd6b3e91fe44dd4b7015 100644 (file)
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -486,7 +486,7 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
        drm_connector_helper_add(drm_connector,
                                 &sti_dvo_connector_helper_funcs);
 
-       err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+       err = drm_connector_attach_encoder(drm_connector, encoder);
        if (err) {
                DRM_ERROR("Failed to attach a connector to a encoder\n");
                goto err_sysfs;

diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index 67bbdb49fffc96fe54ebd44849b472db3ba248fc..49438337f70dc5e66ac2c12a5b41737dc17fd491 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -709,7 +709,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
        drm_connector_helper_add(drm_connector,
                        &sti_hda_connector_helper_funcs);
 
-       err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+       err = drm_connector_attach_encoder(drm_connector, encoder);
        if (err) {
                DRM_ERROR("Failed to attach a connector to a encoder\n");
                goto err_sysfs;

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 0c3008356ab87ab74aea62b17ecbb06b983cd626..34cdc4644435046711d388e41cd7ba71660a7fe1 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1290,7 +1290,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
 
        hdmi->drm_connector = drm_connector;
 
-       err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+       err = drm_connector_attach_encoder(drm_connector, encoder);
        if (err) {
                DRM_ERROR("Failed to attach a connector to a encoder\n");
                goto err_sysfs;

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 9b4b1d01542321c63c24bd96e57a0a54257ef16e..061d2e0d9011ee88991b3f0fb1b4e2dd54925bee 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -623,7 +623,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
        ret = cec_register_adapter(hdmi->cec_adap, dev);
        if (ret < 0)
                goto err_cleanup_connector;
-       drm_mode_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
+       drm_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
 
        return 0;
 

diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
index a69fe2e1f9d1d8d1a8c1f6fc2c8f90198e731659..af7dcb6da351408391892dff43c9fc574291ae50 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
+++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
@@ -149,7 +149,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
                        goto err_cleanup_connector;
                }
 
-               drm_mode_connector_attach_encoder(&lvds->connector,
+               drm_connector_attach_encoder(&lvds->connector,
                                                  &lvds->encoder);
 
                ret = drm_panel_attach(tcon->panel, &lvds->connector);

diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index 96d21b07f8fcac9d9d89c8f3580c8be62f800c62..bf068da6b12e11b7a9440fdca6ff03ca84ff2479 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -215,7 +215,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
                        goto err_cleanup_connector;
                }
 
-               drm_mode_connector_attach_encoder(&rgb->connector,
+               drm_connector_attach_encoder(&rgb->connector,
                                                  &rgb->encoder);
 
                ret = drm_panel_attach(tcon->panel, &rgb->connector);

diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index b070d522ed8da9c761e0512643036cecd0ee888a..1a838d2082110679324824e4a235b45691e5556a 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -623,7 +623,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
        }
        tv->connector.interlace_allowed = true;
 
-       drm_mode_connector_attach_encoder(&tv->connector, &tv->encoder);
+       drm_connector_attach_encoder(&tv->connector, &tv->encoder);
 
        return 0;
 

diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index 2b40d1f6aee8946bd028e90106a4a7de8aba4b71..e3b34a3455460fbab688148f6d19c2ed0607f4f4 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -941,7 +941,7 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
                goto err_cleanup_connector;
        }
 
-       drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder);
+       drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
        drm_panel_attach(dsi->panel, &dsi->connector);
 
        return 0;

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index ad88ec23032976e2eae1cbda9aeb86365a4c8def..ee6ca8fa1c6554d89b5f0ff0c8cb35f8bb09a5ab 100644 (file)
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -1052,7 +1052,7 @@ static int tegra_dsi_init(struct host1x_client *client)
                drm_encoder_helper_add(&dsi->output.encoder,
                                       &tegra_dsi_encoder_helper_funcs);
 
-               drm_mode_connector_attach_encoder(&dsi->output.connector,
+               drm_connector_attach_encoder(&dsi->output.connector,
                                                  &dsi->output.encoder);
                drm_connector_register(&dsi->output.connector);
 

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 784739a9f497d530e7425a34bd958956033302bb..0082468f703c8c12ec89b142142b61b84b22fe89 100644 (file)
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1488,7 +1488,7 @@ static int tegra_hdmi_init(struct host1x_client *client)
        drm_encoder_helper_add(&hdmi->output.encoder,
                               &tegra_hdmi_encoder_helper_funcs);
 
-       drm_mode_connector_attach_encoder(&hdmi->output.connector,
+       drm_connector_attach_encoder(&hdmi->output.connector,
                                          &hdmi->output.encoder);
        drm_connector_register(&hdmi->output.connector);
 

diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index 78ec5193741dd51a6d8de1d7aeefd5ec8c14cb91..28a78d3120bce31448123eaa9dad1c5ac6264e57 100644 (file)
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -289,7 +289,7 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc)
        drm_encoder_helper_add(&output->encoder,
                               &tegra_rgb_encoder_helper_funcs);
 
-       drm_mode_connector_attach_encoder(&output->connector,
+       drm_connector_attach_encoder(&output->connector,
                                          &output->encoder);
        drm_connector_register(&output->connector);
 

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 7d2a955fc5152e3cb9dcace93fc877dc15b43e87..d7fe9f15def1dbf426b4f23bb7fe46cfa64248af 100644 (file)
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -2622,7 +2622,7 @@ static int tegra_sor_init(struct host1x_client *client)
                         encoder, NULL);
        drm_encoder_helper_add(&sor->output.encoder, helpers);
 
-       drm_mode_connector_attach_encoder(&sor->output.connector,
+       drm_connector_attach_encoder(&sor->output.connector,
                                          &sor->output.encoder);
        drm_connector_register(&sor->output.connector);
 

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index d616d64a672542d3dbd6a8a44d79007ea8979d59..a1acab39d87f49385c51edddbaeae87e9745c956 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -223,7 +223,7 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
        connector->interlace_allowed = 0;
        connector->doublescan_allowed = 0;
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret)
                goto fail;
 

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 46dacca3cce884ad0d070955afad81e94750cd76..daebf1aa6b0a841dc28d8b681e591b5445a116c1 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -240,7 +240,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
        connector->interlace_allowed = 0;
        connector->doublescan_allowed = 0;
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret)
                goto fail;
 

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 8fac12e1a1a4d0f9d814f00e66b21f197f64973a..68e88bed77ca795dbb3537599e76fdab86e62128 100644 (file)
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -200,7 +200,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
        drm_connector_helper_add(connector, &udl_connector_helper_funcs);
 
        drm_connector_register(connector);
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        connector->polled = DRM_CONNECTOR_POLL_HPD |
                DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
 

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 91f284e1b908124e456c1f1251066d0dcb0d0305..fd5522fd179e56399c63ce819e0f2a3580bc9ec1 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -329,7 +329,7 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
        connector->interlace_allowed = 1;
        connector->doublescan_allowed = 0;
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 3a9a302247a2f162fc77688bb25ae9ebf86523b5..8e7facb6514efdc7e0d90eadb7240e867cff4ba4 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -404,7 +404,7 @@ static struct drm_connector *vc4_vec_connector_init(struct drm_device *dev,
                                   VC4_VEC_TV_MODE_NTSC);
        vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
 
-       drm_mode_connector_attach_encoder(connector, vec->encoder);
+       drm_connector_attach_encoder(connector, vec->encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index ff9933e794169f9af7701569e1fe522bac33a072..25503b93359910f16caa1c64cbe14f7030c2a7c6 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -292,7 +292,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
        drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
        encoder->possible_crtcs = 1 << index;
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
        drm_connector_register(connector);
        return 0;
 }

diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index a7c0ec9b643f1d9ef3ff2ef1b17c28dd3f8f2044..901012cb1af1dfdbc29eb3bb458afe1bd0f1e68c 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -83,7 +83,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)
        }
        encoder->possible_crtcs = 1;
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret) {
                DRM_ERROR("Failed to attach connector to encoder\n");
                goto err_attach;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index dc0cfda26b1b5fef116c59a5db06e77514d13fe1..a234fe0e1061224d188e63c0873f4b7891656ff4 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -438,7 +438,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_connector;
        }
 
-       (void) drm_mode_connector_attach_encoder(connector, encoder);
+       (void) drm_connector_attach_encoder(connector, encoder);
        encoder->possible_crtcs = (1 << unit);
        encoder->possible_clones = 0;
 

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 73cf3c6e1591ff615ff381309cee57dc2d5cf9b1..dd417eb745242118df76cb5342d35582ba5a0b50 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -695,7 +695,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_connector;
        }
 
-       (void) drm_mode_connector_attach_encoder(connector, encoder);
+       (void) drm_connector_attach_encoder(connector, encoder);
        encoder->possible_crtcs = (1 << unit);
        encoder->possible_clones = 0;
 

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index a474d87b1af31a0487645a8e018292abee3b25d7..4cca78cab03f602ea62947f0ca404124a3b89207 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -1486,7 +1486,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
                goto err_free_connector;
        }
 
-       (void) drm_mode_connector_attach_encoder(connector, encoder);
+       (void) drm_connector_attach_encoder(connector, encoder);
        encoder->possible_crtcs = (1 << unit);
        encoder->possible_clones = 0;
 

diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index d073c67375000dd2e0c8f86865810e7570a12932..78655269d84343d683fc2278740ff21e075c3d1d 100644 (file)
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -326,7 +326,7 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi)
        drm_connector_helper_add(&hdmi->connector,
                                 &zx_hdmi_connector_helper_funcs);
 
-       drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
+       drm_connector_attach_encoder(&hdmi->connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
index 0de1a71ca4e082b7deddd010319f648237f05d30..b73afb212fb246f8e5e7c9b5e1def38f8d1df8c8 100644 (file)
--- a/drivers/gpu/drm/zte/zx_tvenc.c
+++ b/drivers/gpu/drm/zte/zx_tvenc.c
@@ -297,7 +297,7 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc)
                           DRM_MODE_CONNECTOR_Composite);
        drm_connector_helper_add(connector, &zx_tvenc_connector_helper_funcs);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 3e78ee21b8d0076bc386e5e27ce7768b5d8f2684..23d1ff4355a0304c9a1923d0e87a774b9f128414 100644 (file)
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -175,7 +175,7 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga)
 
        drm_connector_helper_add(connector, &zx_vga_connector_helper_funcs);
 
-       ret = drm_mode_connector_attach_encoder(connector, encoder);
+       ret = drm_connector_attach_encoder(connector, encoder);
        if (ret) {
                DRM_DEV_ERROR(dev, "failed to attach encoder: %d\n", ret);
                goto clean_connector;

diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index a943d2f683ed393d649892cee85697c76f93798b..da4a93df8d75c51bf0284d4f5d9dd0ee95bd0ecb 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -655,7 +655,7 @@ static int vbox_connector_init(struct drm_device *dev,
                                   dev->mode_config.suggested_y_property, 0);
        drm_connector_register(connector);
 
-       drm_mode_connector_attach_encoder(connector, encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return 0;
 }

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 4411c0542871c7ed9db306b7609cf29714762956..f9a78a53bd9fe166a7fd3bf6829b3b4150deb195 100644 (file)
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1085,7 +1085,7 @@ int drm_connector_init(struct drm_device *dev,
                       int connector_type);
 int drm_connector_register(struct drm_connector *connector);
 void drm_connector_unregister(struct drm_connector *connector);
-int drm_mode_connector_attach_encoder(struct drm_connector *connector,
+int drm_connector_attach_encoder(struct drm_connector *connector,
                                      struct drm_encoder *encoder);
 
 void drm_connector_cleanup(struct drm_connector *connector);