Skip to content

Commit

Permalink
drm: rcar-du: Remove unneeded rcar_du_crtc plane field
Browse files Browse the repository at this point in the history
The rcar_du_crtc plane field is only used to check for an error that
can't occur. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
  • Loading branch information
Laurent Pinchart committed Mar 3, 2015
1 parent 4709419 commit 53dff60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 2 additions & 5 deletions drivers/gpu/drm/rcar-du/rcar_du_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,6 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
if (rcrtc->started)
return;

if (WARN_ON(rcrtc->plane->format == NULL))
return;

/* Set display off and background to black */
rcar_du_crtc_write(rcrtc, DOOR, DOOR_RGB(0, 0, 0));
rcar_du_crtc_write(rcrtc, BPOR, BPOR_RGB(0, 0, 0));
Expand Down Expand Up @@ -606,9 +603,9 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
rcrtc->mmio_offset = mmio_offsets[index];
rcrtc->index = index;
rcrtc->enabled = false;
rcrtc->plane = &rgrp->planes.planes[index % 2];

ret = drm_crtc_init_with_planes(rcdu->ddev, crtc, &rcrtc->plane->plane,
ret = drm_crtc_init_with_planes(rcdu->ddev, crtc,
&rgrp->planes.planes[index % 2].plane,
NULL, &crtc_funcs);
if (ret < 0)
return ret;
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/rcar-du/rcar_du_crtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <drm/drm_crtc.h>

struct rcar_du_group;
struct rcar_du_plane;

struct rcar_du_crtc {
struct drm_crtc crtc;
Expand All @@ -39,7 +38,6 @@ struct rcar_du_crtc {
bool enabled;

struct rcar_du_group *group;
struct rcar_du_plane *plane;
};

#define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc)
Expand Down

0 comments on commit 53dff60

Please sign in to comment.