Merge "msm: vidc: Clean up creation of debugfs entries" (ca8c7061) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -552,7 +552,7 @@ static int __init msm_vidc_init(void)

	INIT_LIST_HEAD(&vidc_driver->cores);		INIT_LIST_HEAD(&vidc_driver->cores);
	mutex_init(&vidc_driver->lock);		mutex_init(&vidc_driver->lock);
	vidc_driver->debugfs_root = debugfs_create_dir("msm_vidc", NULL);		vidc_driver->debugfs_root = msm_vidc_debugfs_init_drv();
	if (!vidc_driver->debugfs_root)		if (!vidc_driver->debugfs_root)
	dprintk(VIDC_ERR,		dprintk(VIDC_ERR,
	"Failed to create debugfs for msm_vidc\n");		"Failed to create debugfs for msm_vidc\n");

drivers/media/platform/msm/vidc/msm_vidc_debug.c

+45 −28

Original line number	Original line	Diff line number	Diff line
	@@ -127,63 +127,80 @@ static const struct file_operations ssr_fops = {
	.write = trigger_ssr_write,		.write = trigger_ssr_write,
	};		};

	struct dentry msm_vidc_debugfs_init_core(struct msm_vidc_core core,		struct dentry *msm_vidc_debugfs_init_drv(void)
	struct dentry *parent)
	{		{
	struct dentry *dir = NULL;		struct dentry *dir = debugfs_create_dir("msm_vidc", NULL);
	char debugfs_name[MAX_DEBUGFS_NAME];		if (IS_ERR_OR_NULL(dir)) {
	if (!core) {		dir = NULL;
	dprintk(VIDC_ERR, "Invalid params, core: %p\n", core);
	goto failed_create_dir;		goto failed_create_dir;
	}		}

	snprintf(debugfs_name, MAX_DEBUGFS_NAME, "core%d", core->id);
	dir = debugfs_create_dir(debugfs_name, parent);
	if (!dir) {
	dprintk(VIDC_ERR, "Failed to create debugfs for msm_vidc\n");
	goto failed_create_dir;
	}
	if (!debugfs_create_file("info", S_IRUGO, dir, core, &core_info_fops)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;
	}
	if (!debugfs_create_u32("debug_level", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("debug_level", S_IRUGO \| S_IWUSR,
	parent, &msm_vidc_debug)) {		dir, &msm_vidc_debug)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("fw_level", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("fw_level", S_IRUGO \| S_IWUSR,
	parent, &msm_fw_debug)) {		dir, &msm_fw_debug)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;
	}
	if (!debugfs_create_file("trigger_ssr", S_IWUSR,
	dir, core, &ssr_fops)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("fw_debug_mode", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("fw_debug_mode", S_IRUGO \| S_IWUSR,
	parent, &msm_fw_debug_mode)) {		dir, &msm_fw_debug_mode)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("fw_low_power_mode", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("fw_low_power_mode", S_IRUGO \| S_IWUSR,
	parent, &msm_fw_low_power_mode)) {		dir, &msm_fw_low_power_mode)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("vp8_low_tier", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("vp8_low_tier", S_IRUGO \| S_IWUSR,
	parent, &msm_vp8_low_tier)) {		dir, &msm_vp8_low_tier)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("debug_output", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("debug_output", S_IRUGO \| S_IWUSR,
	parent, &msm_vidc_debug_out)) {		dir, &msm_vidc_debug_out)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}
	if (!debugfs_create_u32("hw_rsp_timeout", S_IRUGO \| S_IWUSR,		if (!debugfs_create_u32("hw_rsp_timeout", S_IRUGO \| S_IWUSR,
	parent, &msm_vidc_hw_rsp_timeout)) {		dir, &msm_vidc_hw_rsp_timeout)) {
			dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
			goto failed_create_dir;
			}
			return dir;

			failed_create_dir:
			if (dir)
			debugfs_remove_recursive(vidc_driver->debugfs_root);

			return NULL;
			}

			struct dentry msm_vidc_debugfs_init_core(struct msm_vidc_core core,
			struct dentry *parent)
			{
			struct dentry *dir = NULL;
			char debugfs_name[MAX_DEBUGFS_NAME];
			if (!core) {
			dprintk(VIDC_ERR, "Invalid params, core: %p\n", core);
			goto failed_create_dir;
			}

			snprintf(debugfs_name, MAX_DEBUGFS_NAME, "core%d", core->id);
			dir = debugfs_create_dir(debugfs_name, parent);
			if (!dir) {
			dprintk(VIDC_ERR, "Failed to create debugfs for msm_vidc\n");
			goto failed_create_dir;
			}
			if (!debugfs_create_file("info", S_IRUGO, dir, core, &core_info_fops)) {
			dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
			goto failed_create_dir;
			}
			if (!debugfs_create_file("trigger_ssr", S_IWUSR,
			dir, core, &ssr_fops)) {
	dprintk(VIDC_ERR, "debugfs_create_file: fail\n");		dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
	goto failed_create_dir;		goto failed_create_dir;
	}		}

drivers/media/platform/msm/vidc/msm_vidc_debug.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,7 @@ extern int msm_vidc_hw_rsp_timeout;
	} while (0)		} while (0)


			struct dentry *msm_vidc_debugfs_init_drv(void);
	struct dentry msm_vidc_debugfs_init_core(struct msm_vidc_core core,		struct dentry msm_vidc_debugfs_init_core(struct msm_vidc_core core,
	struct dentry *parent);		struct dentry *parent);
	struct dentry msm_vidc_debugfs_init_inst(struct msm_vidc_inst inst,		struct dentry msm_vidc_debugfs_init_inst(struct msm_vidc_inst inst,