diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/power.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index fe67a8af520..23a8a929557 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -108,7 +108,7 @@ acpi_power_get_context(acpi_handle handle, return result; } - *resource = (struct acpi_power_resource *)acpi_driver_data(device); + *resource = acpi_driver_data(device); if (!resource) return -ENODEV; @@ -442,7 +442,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset) struct acpi_power_resource *resource = NULL; - resource = (struct acpi_power_resource *)seq->private; + resource = seq->private; if (!resource) goto end; @@ -590,7 +590,7 @@ static int acpi_power_remove(struct acpi_device *device, int type) if (!device || !acpi_driver_data(device)) return -EINVAL; - resource = (struct acpi_power_resource *)acpi_driver_data(device); + resource = acpi_driver_data(device); acpi_power_remove_fs(device); |