Commit 3a608bcb authored by Laurent Pinchart's avatar Laurent Pinchart

drm: rcar-du: Drop local encoder variable

The local encoder variable is an alias for &renc->base, and is only use
twice. It doesn't help much, drop it, along with the
rcar_encoder_to_drm_encoder() macro that is then unused.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
parent 9a248605
...@@ -61,7 +61,6 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, ...@@ -61,7 +61,6 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
struct device_node *enc_node) struct device_node *enc_node)
{ {
struct rcar_du_encoder *renc; struct rcar_du_encoder *renc;
struct drm_encoder *encoder;
struct drm_bridge *bridge; struct drm_bridge *bridge;
int ret; int ret;
...@@ -107,12 +106,11 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, ...@@ -107,12 +106,11 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
return -ENOMEM; return -ENOMEM;
renc->output = output; renc->output = output;
encoder = rcar_encoder_to_drm_encoder(renc);
dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n", dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n",
enc_node, output); enc_node, output);
ret = drm_encoder_init(&rcdu->ddev, encoder, &rcar_du_encoder_funcs, ret = drm_encoder_init(&rcdu->ddev, &renc->base, &rcar_du_encoder_funcs,
DRM_MODE_ENCODER_NONE, NULL); DRM_MODE_ENCODER_NONE, NULL);
if (ret < 0) { if (ret < 0) {
kfree(renc); kfree(renc);
...@@ -128,5 +126,5 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, ...@@ -128,5 +126,5 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
* Attach the bridge to the encoder. The bridge will create the * Attach the bridge to the encoder. The bridge will create the
* connector. * connector.
*/ */
return drm_bridge_attach(encoder, bridge, NULL, 0); return drm_bridge_attach(&renc->base, bridge, NULL, 0);
} }
...@@ -22,8 +22,6 @@ struct rcar_du_encoder { ...@@ -22,8 +22,6 @@ struct rcar_du_encoder {
#define to_rcar_encoder(e) \ #define to_rcar_encoder(e) \
container_of(e, struct rcar_du_encoder, base) container_of(e, struct rcar_du_encoder, base)
#define rcar_encoder_to_drm_encoder(e) (&(e)->base)
int rcar_du_encoder_init(struct rcar_du_device *rcdu, int rcar_du_encoder_init(struct rcar_du_device *rcdu,
enum rcar_du_output output, enum rcar_du_output output,
struct device_node *enc_node); struct device_node *enc_node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment