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

Commit 106c19e7 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: button: remove button->device pointer 



We no longer need a pointer from struct acpi_button back to the
struct acpi_device.  Everywhere we used that pointer, we either
already have, or can easily get, the acpi_device pointer without
using the copy from acpi_button.  So this patch removes the
structure element.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent bf04a772

drivers/acpi/button.c

+13 −18
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ static struct acpi_driver acpi_button_driver = { 
};

};





struct acpi_button {

struct acpi_button {

	struct acpi_device *device;	/* Fixed button kludge */

	unsigned int type;

	unsigned int type;

	struct input_dev *input;

	struct input_dev *input;

	char phys[32];			/* for input device */

	char phys[32];			/* for input device */
@@ -126,10 +125,10 @@ static struct proc_dir_entry *acpi_button_dir; 




static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)

static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)

{

{

	struct acpi_button *button = seq->private;

	struct acpi_device *device = seq->private;





	seq_printf(seq, "type:                    %s\n",

	seq_printf(seq, "type:                    %s\n",

		   acpi_device_name(button->device));

		   acpi_device_name(device));

	return 0;

	return 0;

}

}
@@ -140,11 +139,11 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file) 




static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)

static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)

{

{

	struct acpi_button *button = seq->private;

	struct acpi_device *device = seq->private;

	acpi_status status;

	acpi_status status;

	unsigned long long state;

	unsigned long long state;





	status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state);

	status = acpi_evaluate_integer(device->handle, "_LID", NULL, &state);

	seq_printf(seq, "state:      %s\n",

	seq_printf(seq, "state:      %s\n",

		   ACPI_FAILURE(status) ? "unsupported" :

		   ACPI_FAILURE(status) ? "unsupported" :

			(state ? "open" : "closed"));

			(state ? "open" : "closed"));
@@ -198,8 +197,7 @@ static int acpi_button_add_fs(struct acpi_device *device) 
	/* 'info' [R] */

	/* 'info' [R] */

	entry = proc_create_data(ACPI_BUTTON_FILE_INFO,

	entry = proc_create_data(ACPI_BUTTON_FILE_INFO,

				 S_IRUGO, acpi_device_dir(device),

				 S_IRUGO, acpi_device_dir(device),

				 &acpi_button_info_fops,

				 &acpi_button_info_fops, device);

				 acpi_driver_data(device));

	if (!entry)

	if (!entry)

		return -ENODEV;

		return -ENODEV;
@@ -207,8 +205,7 @@ static int acpi_button_add_fs(struct acpi_device *device) 
	if (button->type == ACPI_BUTTON_TYPE_LID) {

	if (button->type == ACPI_BUTTON_TYPE_LID) {

		entry = proc_create_data(ACPI_BUTTON_FILE_STATE,

		entry = proc_create_data(ACPI_BUTTON_FILE_STATE,

					 S_IRUGO, acpi_device_dir(device),

					 S_IRUGO, acpi_device_dir(device),

					 &acpi_button_state_fops,

					 &acpi_button_state_fops, device);

					 acpi_driver_data(device));

		if (!entry)

		if (!entry)

			return -ENODEV;

			return -ENODEV;

	}

	}
@@ -238,13 +235,13 @@ static int acpi_button_remove_fs(struct acpi_device *device) 
/* --------------------------------------------------------------------------

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

                                Driver Interface

                                Driver Interface

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

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

static int acpi_lid_send_state(struct acpi_button *button)

static int acpi_lid_send_state(struct acpi_device *device)

{

{

	struct acpi_button *button = acpi_driver_data(device);

	unsigned long long state;

	unsigned long long state;

	acpi_status status;

	acpi_status status;





	status = acpi_evaluate_integer(button->device->handle, "_LID", NULL,

	status = acpi_evaluate_integer(device->handle, "_LID", NULL, &state);

					&state);

	if (ACPI_FAILURE(status))

	if (ACPI_FAILURE(status))

		return -ENODEV;

		return -ENODEV;
@@ -266,7 +263,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
	case ACPI_BUTTON_NOTIFY_STATUS:

	case ACPI_BUTTON_NOTIFY_STATUS:

		input = button->input;

		input = button->input;

		if (button->type == ACPI_BUTTON_TYPE_LID) {

		if (button->type == ACPI_BUTTON_TYPE_LID) {

			acpi_lid_send_state(button);

			acpi_lid_send_state(device);

		} else {

		} else {

			int keycode = test_bit(KEY_SLEEP, input->keybit) ?

			int keycode = test_bit(KEY_SLEEP, input->keybit) ?

						KEY_SLEEP : KEY_POWER;

						KEY_SLEEP : KEY_POWER;
@@ -277,8 +274,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
			input_sync(input);

			input_sync(input);

		}

		}





		acpi_bus_generate_proc_event(button->device, event,

		acpi_bus_generate_proc_event(device, event, ++button->pushed);

					++button->pushed);

		break;

		break;

	default:

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -292,7 +288,7 @@ static int acpi_button_resume(struct acpi_device *device) 
	struct acpi_button *button = acpi_driver_data(device);

	struct acpi_button *button = acpi_driver_data(device);





	if (button->type == ACPI_BUTTON_TYPE_LID)

	if (button->type == ACPI_BUTTON_TYPE_LID)

		return acpi_lid_send_state(button);

		return acpi_lid_send_state(device);

	return 0;

	return 0;

}

}
@@ -307,7 +303,6 @@ static int acpi_button_add(struct acpi_device *device) 
	if (!button)

	if (!button)

		return -ENOMEM;

		return -ENOMEM;





	button->device = device;

	device->driver_data = button;

	device->driver_data = button;





	button->input = input = input_allocate_device();

	button->input = input = input_allocate_device();
@@ -390,7 +385,7 @@ static int acpi_button_add(struct acpi_device *device) 
	if (error)

	if (error)

		goto err_remove_fs;

		goto err_remove_fs;

	if (button->type == ACPI_BUTTON_TYPE_LID)

	if (button->type == ACPI_BUTTON_TYPE_LID)

		acpi_lid_send_state(button);

		acpi_lid_send_state(device);





	if (device->wakeup.flags.valid) {

	if (device->wakeup.flags.valid) {

		/* Button's GPE is run-wake GPE */

		/* Button's GPE is run-wake GPE */