Commit aecad432 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI: Cleanup custom_method debug stuff 



- Move param aml_debug_output to other params into sysfs.c
- Split acpi_debugfs_init to prepare custom_method to be
  an own .config option and driver.

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatar <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 61c4f2c8

drivers/acpi/debugfs.c

+13 −19
Original line number Original line Diff line number Diff line
@@ -12,13 +12,8 @@ 
#define _COMPONENT		ACPI_SYSTEM_COMPONENT

#define _COMPONENT		ACPI_SYSTEM_COMPONENT

ACPI_MODULE_NAME("debugfs");

ACPI_MODULE_NAME("debugfs");







struct dentry *acpi_debugfs_dir;

/* /sys/modules/acpi/parameters/aml_debug_output */

static struct dentry *cm_dentry;



module_param_named(aml_debug_output, acpi_gbl_enable_aml_debug_object,

		   bool, 0644);

MODULE_PARM_DESC(aml_debug_output,

		 "To enable/disable the ACPI Debug Object output.");





/* /sys/kernel/debug/acpi/custom_method */

/* /sys/kernel/debug/acpi/custom_method */
@@ -80,23 +75,22 @@ static const struct file_operations cm_fops = { 
	.llseek = default_llseek,

	.llseek = default_llseek,

};

};





int __init acpi_debugfs_init(void)

static int __init acpi_custom_method_init(void)

{

{

	struct dentry *acpi_dir, *cm_dentry;

	if (!acpi_debugfs_dir)



		return -ENOENT;

	acpi_dir = debugfs_create_dir("acpi", NULL);

	if (!acpi_dir)

		goto err;





	cm_dentry = debugfs_create_file("custom_method", S_IWUSR,

	cm_dentry = debugfs_create_file("custom_method", S_IWUSR,

					acpi_dir, NULL, &cm_fops);

					acpi_debugfs_dir, NULL, &cm_fops);

	if (!cm_dentry)

	if (!cm_dentry)

		goto err;

		return -ENODEV;





	return 0;

	return 0;

}





err:

void __init acpi_debugfs_init(void)

	if (acpi_dir)

{

		debugfs_remove(acpi_dir);

	acpi_debugfs_dir = debugfs_create_dir("acpi", NULL);

	return -EINVAL;



	acpi_custom_method_init();

}
 
}

drivers/acpi/internal.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,9 +28,10 @@ int acpi_scan_init(void); 
int acpi_sysfs_init(void);

int acpi_sysfs_init(void);





#ifdef CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

extern struct dentry *acpi_debugfs_dir;

int acpi_debugfs_init(void);

int acpi_debugfs_init(void);

#else

#else

static inline int acpi_debugfs_init(void) { return 0; }

static inline void acpi_debugfs_init(void) { return; }

#endif

#endif





/* --------------------------------------------------------------------------

/* --------------------------------------------------------------------------

drivers/acpi/sysfs.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,14 @@ module_param_call(trace_state, param_set_trace_state, param_get_trace_state, 
		  NULL, 0644);

		  NULL, 0644);

#endif /* CONFIG_ACPI_DEBUG */

#endif /* CONFIG_ACPI_DEBUG */







/* /sys/modules/acpi/parameters/aml_debug_output */



module_param_named(aml_debug_output, acpi_gbl_enable_aml_debug_object,

		   bool, 0644);

MODULE_PARM_DESC(aml_debug_output,

		 "To enable/disable the ACPI Debug Object output.");



/* /sys/module/acpi/parameters/acpica_version */

/* /sys/module/acpi/parameters/acpica_version */

static int param_get_acpica_version(char *buffer, struct kernel_param *kp)

static int param_get_acpica_version(char *buffer, struct kernel_param *kp)

{

{