Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/sti: fix compositor debugfs creation

Fix typo and issue while creating the vid and mixer debugfs entries.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

+12 -16
+9 -13
drivers/gpu/drm/sti/sti_compositor.c
··· 55 55 }, 56 56 }; 57 57 58 - int sti_compositor_debufs_init(struct sti_compositor *compo, 59 - struct drm_minor *minor) 58 + int sti_compositor_debugfs_init(struct sti_compositor *compo, 59 + struct drm_minor *minor) 60 60 { 61 - int ret = 0, i; 61 + unsigned int i; 62 62 63 - for (i = 0; compo->vid[i]; i++) { 64 - ret = vid_debugfs_init(compo->vid[i], minor); 65 - if (ret) 66 - return ret; 67 - } 63 + for (i = 0; i < STI_MAX_VID; i++) 64 + if (compo->vid[i]) 65 + vid_debugfs_init(compo->vid[i], minor); 68 66 69 - for (i = 0; compo->mixer[i]; i++) { 70 - ret = sti_mixer_debugfs_init(compo->mixer[i], minor); 71 - if (ret) 72 - return ret; 73 - } 67 + for (i = 0; i < STI_MAX_MIXER; i++) 68 + if (compo->mixer[i]) 69 + sti_mixer_debugfs_init(compo->mixer[i], minor); 74 70 75 71 return 0; 76 72 }
+2 -2
drivers/gpu/drm/sti/sti_compositor.h
··· 79 79 struct notifier_block vtg_vblank_nb[STI_MAX_MIXER]; 80 80 }; 81 81 82 - int sti_compositor_debufs_init(struct sti_compositor *compo, 83 - struct drm_minor *minor); 82 + int sti_compositor_debugfs_init(struct sti_compositor *compo, 83 + struct drm_minor *minor); 84 84 85 85 #endif
+1 -1
drivers/gpu/drm/sti/sti_crtc.c
··· 338 338 struct sti_compositor *compo = dev_get_drvdata(mixer->dev); 339 339 340 340 if (drm_crtc_index(crtc) == 0) 341 - return sti_compositor_debufs_init(compo, crtc->dev->primary); 341 + return sti_compositor_debugfs_init(compo, crtc->dev->primary); 342 342 343 343 return 0; 344 344 }