]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/imx: parallel-display: use local bridge and connector variables
authorPhilipp Zabel <p.zabel@pengutronix.de>
Thu, 10 Dec 2020 15:38:38 +0000 (16:38 +0100)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 4 Jan 2021 11:59:33 +0000 (12:59 +0100)
Use local variables for bridge and connector.
This simplifies the following commits.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/imx/parallel-display.c

index c4dab79a93854af05abd2680c04d8768f7905410..3aae0a22e23555ed16889e392f58f21674bc5a03 100644 (file)
@@ -256,7 +256,9 @@ static const struct drm_bridge_funcs imx_pd_bridge_funcs = {
 static int imx_pd_register(struct drm_device *drm,
        struct imx_parallel_display *imxpd)
 {
+       struct drm_connector *connector = &imxpd->connector;
        struct drm_encoder *encoder = &imxpd->encoder;
+       struct drm_bridge *bridge = &imxpd->bridge;
        int ret;
 
        ret = imx_drm_encoder_parse_of(drm, encoder, imxpd->dev->of_node);
@@ -268,31 +270,29 @@ static int imx_pd_register(struct drm_device *drm,
         * immediately since the current state is ON
         * at this point.
         */
-       imxpd->connector.dpms = DRM_MODE_DPMS_OFF;
+       connector->dpms = DRM_MODE_DPMS_OFF;
 
        drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_NONE);
 
-       imxpd->bridge.funcs = &imx_pd_bridge_funcs;
-       drm_bridge_attach(encoder, &imxpd->bridge, NULL, 0);
+       bridge->funcs = &imx_pd_bridge_funcs;
+       drm_bridge_attach(encoder, bridge, NULL, 0);
 
        if (!imxpd->next_bridge) {
-               drm_connector_helper_add(&imxpd->connector,
-                               &imx_pd_connector_helper_funcs);
-               drm_connector_init(drm, &imxpd->connector,
-                                  &imx_pd_connector_funcs,
+               drm_connector_helper_add(connector,
+                                        &imx_pd_connector_helper_funcs);
+               drm_connector_init(drm, connector, &imx_pd_connector_funcs,
                                   DRM_MODE_CONNECTOR_DPI);
        }
 
        if (imxpd->next_bridge) {
-               ret = drm_bridge_attach(encoder, imxpd->next_bridge,
-                                       &imxpd->bridge, 0);
+               ret = drm_bridge_attach(encoder, imxpd->next_bridge, bridge, 0);
                if (ret < 0) {
                        dev_err(imxpd->dev, "failed to attach bridge: %d\n",
                                ret);
                        return ret;
                }
        } else {
-               drm_connector_attach_encoder(&imxpd->connector, encoder);
+               drm_connector_attach_encoder(connector, encoder);
        }
 
        return 0;