| Message ID | 1487591710-24704-1-git-send-email-vincent.abriou@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 20 February 2017 at 21:55, Vincent Abriou <vincent.abriou@st.com> wrote: > Fix compilation warning introduced by: > commit 0c7ff84f7f9d ("drm/sti: remove deprecated legacy vtg slave") > commit 5e60f595d6ca ("drm/sti: use atomic_helper for commit") > I've pulled this in, please be more careful in future to avoid this sort of thing, it looks like the atomic helper commit wasn't clean and ended up revert previous commits, This should have been spotted on application. Dave.
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index e6c1646..20fc0fbf 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -117,15 +117,6 @@ static int sti_drm_dbg_init(struct drm_minor *minor) return ret; } -static void sti_drm_dbg_cleanup(struct drm_minor *minor) -{ - drm_debugfs_remove_files(sti_drm_dbg_list, - ARRAY_SIZE(sti_drm_dbg_list), minor); - - drm_debugfs_remove_files((struct drm_info_list *)&sti_drm_fps_fops, - 1, minor); -} - static int sti_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) { diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c index 943bce5..2dcba1d 100644 --- a/drivers/gpu/drm/sti/sti_vtg.c +++ b/drivers/gpu/drm/sti/sti_vtg.c @@ -389,7 +389,6 @@ static irqreturn_t vtg_irq(int irq, void *arg) static int vtg_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *np; struct sti_vtg *vtg; struct resource *res; int ret;
Fix compilation warning introduced by: commit 0c7ff84f7f9d ("drm/sti: remove deprecated legacy vtg slave") commit 5e60f595d6ca ("drm/sti: use atomic_helper for commit") Signed-off-by: Vincent Abriou <vincent.abriou@st.com> --- drivers/gpu/drm/sti/sti_drv.c | 9 --------- drivers/gpu/drm/sti/sti_vtg.c | 1 - 2 files changed, 10 deletions(-)