Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47f5c892 authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

ACPI: remove deprecated ACPI procfs I/F 



Rmove deprecated ACPI procfs I/F, including
/proc/acpi/debug_layer
/proc/acpi/debug_level
/proc/acpi/info
/proc/acpi/dsdt
/proc/acpi/fadt
/proc/acpi/sleep

because the sysfs I/F is already available
and has been working well for years.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1c8fce27

drivers/acpi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -54,12 +54,6 @@ config ACPI_PROCFS 
	  they have been replaced by functions in /sys.

	  The deprecated files (and their replacements) include:



	  /proc/acpi/sleep (/sys/power/state)

	  /proc/acpi/info (/sys/module/acpi/parameters/acpica_version)

	  /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)

	  /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)

	  /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)

	  /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)

	  /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)

	  /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/

		cpufreq/*)

drivers/acpi/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ acpi-y += ec.o 
acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o

acpi-y				+= power.o

acpi-y				+= system.o event.o

acpi-y				+= event.o

acpi-y				+= sysfs.o

acpi-$(CONFIG_ACPI_DEBUG)	+= debug.o

acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o

acpi-$(CONFIG_ACPI_NUMA)	+= numa.o

acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o

drivers/acpi/bus.c

+0 −2
Original line number Diff line number Diff line
@@ -1034,8 +1034,6 @@ static int __init acpi_init(void) 
	acpi_scan_init();

	acpi_ec_init();

	acpi_power_init();

	acpi_system_init();

	acpi_debug_init();

	acpi_sysfs_init();

	acpi_debugfs_init();

	acpi_sleep_proc_init();

drivers/acpi/debug.c

deleted100644 → 0
+0 −227
Original line number Diff line number Diff line 
/*

 * debug.c - ACPI debug interface to userspace.

 */



#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/moduleparam.h>

#include <linux/debugfs.h>

#include <linux/slab.h>

#include <asm/uaccess.h>

#include <acpi/acpi_drivers.h>



#define _COMPONENT		ACPI_SYSTEM_COMPONENT

ACPI_MODULE_NAME("debug");



struct acpi_dlayer {

	const char *name;

	unsigned long value;

};

struct acpi_dlevel {

	const char *name;

	unsigned long value;

};

#define ACPI_DEBUG_INIT(v)	{ .name = #v, .value = v }



static const struct acpi_dlayer acpi_debug_layers[] = {

	ACPI_DEBUG_INIT(ACPI_UTILITIES),

	ACPI_DEBUG_INIT(ACPI_HARDWARE),

	ACPI_DEBUG_INIT(ACPI_EVENTS),

	ACPI_DEBUG_INIT(ACPI_TABLES),

	ACPI_DEBUG_INIT(ACPI_NAMESPACE),

	ACPI_DEBUG_INIT(ACPI_PARSER),

	ACPI_DEBUG_INIT(ACPI_DISPATCHER),

	ACPI_DEBUG_INIT(ACPI_EXECUTER),

	ACPI_DEBUG_INIT(ACPI_RESOURCES),

	ACPI_DEBUG_INIT(ACPI_CA_DEBUGGER),

	ACPI_DEBUG_INIT(ACPI_OS_SERVICES),

	ACPI_DEBUG_INIT(ACPI_CA_DISASSEMBLER),

	ACPI_DEBUG_INIT(ACPI_COMPILER),

	ACPI_DEBUG_INIT(ACPI_TOOLS),



	ACPI_DEBUG_INIT(ACPI_BUS_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_AC_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_BATTERY_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_POWER_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_CONTAINER_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_SYSTEM_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_THERMAL_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_MEMORY_DEVICE_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_VIDEO_COMPONENT),

	ACPI_DEBUG_INIT(ACPI_PROCESSOR_COMPONENT),

};



static const struct acpi_dlevel acpi_debug_levels[] = {

	ACPI_DEBUG_INIT(ACPI_LV_INIT),

	ACPI_DEBUG_INIT(ACPI_LV_DEBUG_OBJECT),

	ACPI_DEBUG_INIT(ACPI_LV_INFO),



	ACPI_DEBUG_INIT(ACPI_LV_INIT_NAMES),

	ACPI_DEBUG_INIT(ACPI_LV_PARSE),

	ACPI_DEBUG_INIT(ACPI_LV_LOAD),

	ACPI_DEBUG_INIT(ACPI_LV_DISPATCH),

	ACPI_DEBUG_INIT(ACPI_LV_EXEC),

	ACPI_DEBUG_INIT(ACPI_LV_NAMES),

	ACPI_DEBUG_INIT(ACPI_LV_OPREGION),

	ACPI_DEBUG_INIT(ACPI_LV_BFIELD),

	ACPI_DEBUG_INIT(ACPI_LV_TABLES),

	ACPI_DEBUG_INIT(ACPI_LV_VALUES),

	ACPI_DEBUG_INIT(ACPI_LV_OBJECTS),

	ACPI_DEBUG_INIT(ACPI_LV_RESOURCES),

	ACPI_DEBUG_INIT(ACPI_LV_USER_REQUESTS),

	ACPI_DEBUG_INIT(ACPI_LV_PACKAGE),



	ACPI_DEBUG_INIT(ACPI_LV_ALLOCATIONS),

	ACPI_DEBUG_INIT(ACPI_LV_FUNCTIONS),

	ACPI_DEBUG_INIT(ACPI_LV_OPTIMIZATIONS),



	ACPI_DEBUG_INIT(ACPI_LV_MUTEX),

	ACPI_DEBUG_INIT(ACPI_LV_THREADS),

	ACPI_DEBUG_INIT(ACPI_LV_IO),

	ACPI_DEBUG_INIT(ACPI_LV_INTERRUPTS),



	ACPI_DEBUG_INIT(ACPI_LV_AML_DISASSEMBLE),

	ACPI_DEBUG_INIT(ACPI_LV_VERBOSE_INFO),

	ACPI_DEBUG_INIT(ACPI_LV_FULL_TABLES),

	ACPI_DEBUG_INIT(ACPI_LV_EVENTS),

};



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

                              FS Interface (/proc)

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

#ifdef CONFIG_ACPI_PROCFS

#define ACPI_SYSTEM_FILE_DEBUG_LAYER	"debug_layer"

#define ACPI_SYSTEM_FILE_DEBUG_LEVEL		"debug_level"



static int acpi_system_debug_proc_show(struct seq_file *m, void *v)

{

	unsigned int i;



	seq_printf(m, "%-25s\tHex        SET\n", "Description");



	switch ((unsigned long)m->private) {

	case 0:

		for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) {

			seq_printf(m, "%-25s\t0x%08lX [%c]\n",

				     acpi_debug_layers[i].name,

				     acpi_debug_layers[i].value,

				     (acpi_dbg_layer & acpi_debug_layers[i].

				      value) ? '*' : ' ');

		}

		seq_printf(m, "%-25s\t0x%08X [%c]\n", "ACPI_ALL_DRIVERS",

			     ACPI_ALL_DRIVERS,

			     (acpi_dbg_layer & ACPI_ALL_DRIVERS) ==

			     ACPI_ALL_DRIVERS ? '*' : (acpi_dbg_layer &

						       ACPI_ALL_DRIVERS) ==

			     0 ? ' ' : '-');

		seq_printf(m,

			     "--\ndebug_layer = 0x%08X (* = enabled, - = partial)\n",

			     acpi_dbg_layer);

		break;

	case 1:

		for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) {

			seq_printf(m, "%-25s\t0x%08lX [%c]\n",

				     acpi_debug_levels[i].name,

				     acpi_debug_levels[i].value,

				     (acpi_dbg_level & acpi_debug_levels[i].

				      value) ? '*' : ' ');

		}

		seq_printf(m, "--\ndebug_level = 0x%08X (* = enabled)\n",

			     acpi_dbg_level);

		break;

	}

	return 0;

}



static int acpi_system_debug_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, acpi_system_debug_proc_show, PDE(inode)->data);

}



static ssize_t acpi_system_debug_proc_write(struct file *file,

			const char __user * buffer,

			size_t count, loff_t *pos)

{

	char debug_string[12] = { '\0' };





	if (count > sizeof(debug_string) - 1)

		return -EINVAL;



	if (copy_from_user(debug_string, buffer, count))

		return -EFAULT;



	debug_string[count] = '\0';



	switch ((unsigned long)PDE(file->f_path.dentry->d_inode)->data) {

	case 0:

		acpi_dbg_layer = simple_strtoul(debug_string, NULL, 0);

		break;

	case 1:

		acpi_dbg_level = simple_strtoul(debug_string, NULL, 0);

		break;

	default:

		return -EINVAL;

	}



	return count;

}



static const struct file_operations acpi_system_debug_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= acpi_system_debug_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

	.write		= acpi_system_debug_proc_write,

};

#endif



int __init acpi_procfs_init(void)

{

#ifdef CONFIG_ACPI_PROCFS

	struct proc_dir_entry *entry;

	int error = 0;

	char *name;



	/* 'debug_layer' [R/W] */

	name = ACPI_SYSTEM_FILE_DEBUG_LAYER;

	entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,

				 acpi_root_dir, &acpi_system_debug_proc_fops,

				 (void *)0);

	if (!entry)

		goto Error;



	/* 'debug_level' [R/W] */

	name = ACPI_SYSTEM_FILE_DEBUG_LEVEL;

	entry = proc_create_data(name, S_IFREG | S_IRUGO | S_IWUSR,

				 acpi_root_dir, &acpi_system_debug_proc_fops,

				 (void *)1);

	if (!entry)

		goto Error;



      Done:

	return error;



      Error:

	remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LEVEL, acpi_root_dir);

	remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);

	error = -ENODEV;

	goto Done;

#else

	return 0;

#endif

}



int __init acpi_debug_init(void)

{

	acpi_procfs_init();

	return 0;

}

drivers/acpi/internal.h

+0 −7
Original line number Diff line number Diff line
@@ -22,15 +22,8 @@ 


int init_acpi_device_notify(void);

int acpi_scan_init(void);

int acpi_system_init(void);

int acpi_sysfs_init(void);



#ifdef CONFIG_ACPI_DEBUG

int acpi_debug_init(void);

#else

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

#endif



#ifdef CONFIG_DEBUG_FS

int acpi_debugfs_init(void);

#else