summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-04-08 15:39:49 +0000
committerLen Brown <len.brown@intel.com>2009-04-11 00:36:40 -0400
commit1bce81131c71064bc3163078f24545b839a31967 (patch)
treee11d1c2f70accf396c878d61796d55d143aedb54 /drivers/acpi/button.c
parente2fb9754d27513918a4936e8cbaad50ff56cfd3d (diff)
downloadlinux-1bce81131c71064bc3163078f24545b839a31967.tar.gz
linux-1bce81131c71064bc3163078f24545b839a31967.tar.bz2
linux-1bce81131c71064bc3163078f24545b839a31967.zip
ACPI: button: use Linux style for getting driver_data
It's typical and slightly more compact to look up the driver_data structure by initializing the automatic variable at its definition. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/button.c')
-rw-r--r--drivers/acpi/button.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index c4632366226f..8ef8f443f539 100644
--- a/drivers/acpi/button.c
+++ b/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);