Merge branch 'button-cleanup' into release (2935b544) · Commits · e / devices / android_kernel_teracube_2e

Documentation/feature-removal-schedule.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -259,14 +259,6 @@ Who: Zhang Rui <rui.zhang@intel.com>

		---------------------------

		What: /proc/acpi/button
		When: August 2007
		Why: /proc/acpi/button has been replaced by events to the input layer
		since 2.6.20.
		Who: Len Brown <len.brown@intel.com>

		---------------------------

		What: /proc/acpi/event
		When: February 2008
		Why: /proc/acpi/event has been replaced by events via the input layer

drivers/acpi/button.c

+60 −103

Original line number	Diff line number	Diff line
		@@ -78,8 +78,6 @@ static int acpi_button_add(struct acpi_device *device);
		static int acpi_button_remove(struct acpi_device *device, int type);
		static int acpi_button_resume(struct acpi_device *device);
		static void acpi_button_notify(struct acpi_device *device, u32 event);
		static int acpi_button_info_open_fs(struct inode inode, struct file file);
		static int acpi_button_state_open_fs(struct inode inode, struct file file);

		static struct acpi_driver acpi_button_driver = {
		.name = "button",
		@@ -101,22 +99,6 @@ struct acpi_button {
		bool wakeup_enabled;
		};

		static const struct file_operations acpi_button_info_fops = {
		.owner = THIS_MODULE,
		.open = acpi_button_info_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};

		static const struct file_operations acpi_button_state_fops = {
		.owner = THIS_MODULE,
		.open = acpi_button_state_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};

		static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
		static struct acpi_device *lid_device;

		@@ -125,20 +107,7 @@ static struct acpi_device *lid_device;
		-------------------------------------------------------------------------- */

		static struct proc_dir_entry *acpi_button_dir;

		static int acpi_button_info_seq_show(struct seq_file seq, void offset)
		{
		struct acpi_device *device = seq->private;

		seq_printf(seq, "type: %s\n",
		acpi_device_name(device));
		return 0;
		}

		static int acpi_button_info_open_fs(struct inode inode, struct file file)
		{
		return single_open(file, acpi_button_info_seq_show, PDE(inode)->data);
		}
		static struct proc_dir_entry *acpi_lid_dir;

		static int acpi_button_state_seq_show(struct seq_file seq, void offset)
		{
		@@ -158,77 +127,85 @@ static int acpi_button_state_open_fs(struct inode inode, struct file file)
		return single_open(file, acpi_button_state_seq_show, PDE(inode)->data);
		}

		static struct proc_dir_entry *acpi_power_dir;
		static struct proc_dir_entry *acpi_sleep_dir;
		static struct proc_dir_entry *acpi_lid_dir;
		static const struct file_operations acpi_button_state_fops = {
		.owner = THIS_MODULE,
		.open = acpi_button_state_open_fs,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		};

		static int acpi_button_add_fs(struct acpi_device *device)
		{
		struct acpi_button *button = acpi_driver_data(device);
		struct proc_dir_entry *entry = NULL;
		int ret = 0;

		switch (button->type) {
		case ACPI_BUTTON_TYPE_POWER:
		if (!acpi_power_dir)
		acpi_power_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_POWER,
		acpi_button_dir);
		entry = acpi_power_dir;
		break;
		case ACPI_BUTTON_TYPE_SLEEP:
		if (!acpi_sleep_dir)
		acpi_sleep_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_SLEEP,
		acpi_button_dir);
		entry = acpi_sleep_dir;
		break;
		case ACPI_BUTTON_TYPE_LID:
		if (!acpi_lid_dir)
		acpi_lid_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_LID,
		acpi_button_dir);
		entry = acpi_lid_dir;
		break;
		/* procfs I/F for ACPI lid device only */
		if (button->type != ACPI_BUTTON_TYPE_LID)
		return 0;

		if (acpi_button_dir \|\| acpi_lid_dir) {
		printk(KERN_ERR PREFIX "More than one Lid device found!\n");
		return -EEXIST;
		}

		if (!entry)
		/* create /proc/acpi/button */
		acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
		if (!acpi_button_dir)
		return -ENODEV;

		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);
		if (!acpi_device_dir(device))
		return -ENODEV;
		/* create /proc/acpi/button/lid */
		acpi_lid_dir = proc_mkdir(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
		if (!acpi_lid_dir) {
		ret = -ENODEV;
		goto remove_button_dir;
		}

		/* 'info' [R] */
		entry = proc_create_data(ACPI_BUTTON_FILE_INFO,
		S_IRUGO, acpi_device_dir(device),
		&acpi_button_info_fops, device);
		if (!entry)
		return -ENODEV;
		/* create /proc/acpi/button/lid/LID/ */
		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), acpi_lid_dir);
		if (!acpi_device_dir(device)) {
		ret = -ENODEV;
		goto remove_lid_dir;
		}

		/* show lid state [R] */
		if (button->type == ACPI_BUTTON_TYPE_LID) {
		/* create /proc/acpi/button/lid/LID/state */
		entry = proc_create_data(ACPI_BUTTON_FILE_STATE,
		S_IRUGO, acpi_device_dir(device),
		&acpi_button_state_fops, device);
		if (!entry)
		return -ENODEV;
		if (!entry) {
		ret = -ENODEV;
		goto remove_dev_dir;
		}

		return 0;
		done:
		return ret;

		remove_dev_dir:
		remove_proc_entry(acpi_device_bid(device),
		acpi_lid_dir);
		acpi_device_dir(device) = NULL;
		remove_lid_dir:
		remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
		remove_button_dir:
		remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
		goto done;
		}

		static int acpi_button_remove_fs(struct acpi_device *device)
		{
		struct acpi_button *button = acpi_driver_data(device);

		if (acpi_device_dir(device)) {
		if (button->type == ACPI_BUTTON_TYPE_LID)
		if (button->type != ACPI_BUTTON_TYPE_LID)
		return 0;

		remove_proc_entry(ACPI_BUTTON_FILE_STATE,
		acpi_device_dir(device));
		remove_proc_entry(ACPI_BUTTON_FILE_INFO,
		acpi_device_dir(device));

		remove_proc_entry(acpi_device_bid(device),
		acpi_device_dir(device)->parent);
		acpi_lid_dir);
		acpi_device_dir(device) = NULL;
		}
		remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
		remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);

		return 0;
		}
		@@ -468,32 +445,12 @@ static int acpi_button_remove(struct acpi_device *device, int type)

		static int __init acpi_button_init(void)
		{
		int result;

		acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
		if (!acpi_button_dir)
		return -ENODEV;

		result = acpi_bus_register_driver(&acpi_button_driver);
		if (result < 0) {
		remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
		return -ENODEV;
		}

		return 0;
		return acpi_bus_register_driver(&acpi_button_driver);
		}

		static void __exit acpi_button_exit(void)
		{
		acpi_bus_unregister_driver(&acpi_button_driver);

		if (acpi_power_dir)
		remove_proc_entry(ACPI_BUTTON_SUBCLASS_POWER, acpi_button_dir);
		if (acpi_sleep_dir)
		remove_proc_entry(ACPI_BUTTON_SUBCLASS_SLEEP, acpi_button_dir);
		if (acpi_lid_dir)
		remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
		remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
		}

		module_init(acpi_button_init);