Skip to content

Commit

Permalink
ACPI: button: use Linux style for getting driver_data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Apr 11, 2009
1 parent e2fb975 commit 1bce811
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/acpi/button.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -291,19 +289,18 @@ 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;
}

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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 1bce811

Please sign in to comment.