Merge "drm/msm/sde: fix compilation issues when debugfs disabled" into msm-4.9 (50801733) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_crtc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -2283,7 +2283,6 @@ static int _sde_crtc_init_debugfs(struct drm_crtc *crtc)

		static void _sde_crtc_destroy_debugfs(struct drm_crtc *crtc)
		{
		return 0;
		}
		#endif /* CONFIG_DEBUG_FS */

+2 −2

Original line number	Diff line number	Diff line
		@@ -1368,6 +1368,7 @@ int sde_encoder_helper_hw_release(struct sde_encoder_phys *phys_enc,
		return 0;
		}

		#ifdef CONFIG_DEBUG_FS
		static int _sde_encoder_status_show(struct seq_file s, void data)
		{
		struct sde_encoder_virt *sde_enc;
		@@ -1413,7 +1414,6 @@ static int _sde_encoder_status_show(struct seq_file s, void data)
		return 0;
		}

		#ifdef CONFIG_DEBUG_FS
		static int _sde_encoder_debugfs_status_open(struct inode *inode,
		struct file *file)
		{
		@@ -1589,7 +1589,7 @@ static int _sde_encoder_init_debugfs(struct drm_encoder *drm_enc)
		return 0;
		}

		static _sde_encoder_destroy_debugfs(struct drm_encoder *drm_enc)
		static void _sde_encoder_destroy_debugfs(struct drm_encoder *drm_enc)
		{
		}
		#endif

+0 −12

Original line number	Diff line number	Diff line
		@@ -324,18 +324,6 @@ static int _sde_debugfs_init(struct sde_kms *sde_kms)

		static void _sde_debugfs_destroy(struct sde_kms *sde_kms)
		{
		return 0;
		}

		static void sde_debugfs_danger_destroy(struct sde_kms *sde_kms,
		struct dentry *parent)
		{
		}

		static int sde_debugfs_danger_init(struct sde_kms *sde_kms,
		struct dentry *parent)
		{
		return 0;
		}
		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -2916,7 +2916,7 @@ int sde_dbg_debugfs_register(struct dentry *debugfs_root)
		return 0;
		}

		#if defined(CONFIG_DEBUG_FS)
		#ifdef CONFIG_DEBUG_FS
		static void _sde_dbg_debugfs_destroy(void)
		{
		debugfs_remove_recursive(sde_dbg_base.root);