From 5611be41294991ce0bfcccf64de38068488ae2f2 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Wed, 8 Apr 2009 15:39:49 +0000
Subject: [PATCH] --- yaml --- r: 144127 b: refs/heads/master c:
 1bce81131c71064bc3163078f24545b839a31967 h: refs/heads/master i:   144125:
 42e3d97c98d144bc4bc3ca0191d8046fc24af11a   144123:
 53a4fa5601eb8cb3728953c9d5146ca27133dbf0   144119:
 59083e1357a267e065d385ac85dfba8618be184c   144111:
 5e17d72add39d420cf733f41783c7e1678f6edb2   144095:
 f70baadc4783088d4f50aa2a835de8f62c238df5   144063:
 ba6c07675c368cc1237198c053c1f6c13f1f8d4e   143999:
 0dea0a9daf82894aa524809e37e90e1b7e6b8ff8   143871:
 f9d9a86c9306f488d8e3b3cac5fdb2c2af72a9e4 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/acpi/button.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5554d196c64d..4087aa8ed3f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2fb9754d27513918a4936e8cbaad50ff56cfd3d
+refs/heads/master: 1bce81131c71064bc3163078f24545b839a31967
diff --git a/trunk/drivers/acpi/button.c b/trunk/drivers/acpi/button.c
index c4632366226f..8ef8f443f539 100644
--- a/trunk/drivers/acpi/button.c
+++ b/trunk/drivers/acpi/button.c
@@ -162,10 +162,8 @@ static struct proc_dir_entry *acpi_lid_dir;
 
 static int acpi_button_add_fs(struct acpi_device *device)
 {
+	struct acpi_button *button = acpi_driver_data(device);
 	struct proc_dir_entry *entry = NULL;
-	struct acpi_button *button;
-
-	button = acpi_driver_data(device);
 
 	switch (button->type) {
 	case ACPI_BUTTON_TYPE_POWER:
@@ -291,9 +289,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
 
 static int acpi_button_resume(struct acpi_device *device)
 {
-	struct acpi_button *button;
+	struct acpi_button *button = acpi_driver_data(device);
 
-	button = acpi_driver_data(device);
 	if (button->type == ACPI_BUTTON_TYPE_LID)
 		return acpi_lid_send_state(button);
 	return 0;
@@ -301,9 +298,9 @@ static int acpi_button_resume(struct acpi_device *device)
 
 static int acpi_button_add(struct acpi_device *device)
 {
-	int error;
 	struct acpi_button *button;
 	struct input_dev *input;
+	int error;
 
 	button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
 	if (!button)
@@ -419,9 +416,7 @@ static int acpi_button_add(struct acpi_device *device)
 
 static int acpi_button_remove(struct acpi_device *device, int type)
 {
-	struct acpi_button *button;
-
-	button = acpi_driver_data(device);
+	struct acpi_button *button = acpi_driver_data(device);
 
 	acpi_button_remove_fs(device);
 	input_unregister_device(button->input);