diff options
author | Alex He <alex.he@amd.com> | 2012-02-21 03:58:10 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-03-30 04:00:16 -0400 |
commit | 37239978778806ecba54da60676abb46870acebb (patch) | |
tree | 448f278448b94c9dc9f46bf1132ab4ee3584ca10 /drivers/acpi | |
parent | 9505626d7bfeb5bd4b85acb483831ac640b2a5e8 (diff) |
ACPI: Clean redundant codes in scan.c
Clean the redundant codes of apci_bus_get_power_flags().
Signed-off-by: Alex He <alex.he@amd.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8ab80bafe3f1..5d24a17aa854 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -880,7 +880,6 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) | |||
880 | int j; | 880 | int j; |
881 | 881 | ||
882 | device->power.flags.power_resources = 1; | 882 | device->power.flags.power_resources = 1; |
883 | ps->flags.valid = 1; | ||
884 | for (j = 0; j < ps->resources.count; j++) | 883 | for (j = 0; j < ps->resources.count; j++) |
885 | acpi_bus_add_power_resource(ps->resources.handles[j]); | 884 | acpi_bus_add_power_resource(ps->resources.handles[j]); |
886 | } | 885 | } |
@@ -888,10 +887,8 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) | |||
888 | /* Evaluate "_PSx" to see if we can do explicit sets */ | 887 | /* Evaluate "_PSx" to see if we can do explicit sets */ |
889 | object_name[2] = 'S'; | 888 | object_name[2] = 'S'; |
890 | status = acpi_get_handle(device->handle, object_name, &handle); | 889 | status = acpi_get_handle(device->handle, object_name, &handle); |
891 | if (ACPI_SUCCESS(status)) { | 890 | if (ACPI_SUCCESS(status)) |
892 | ps->flags.explicit_set = 1; | 891 | ps->flags.explicit_set = 1; |
893 | ps->flags.valid = 1; | ||
894 | } | ||
895 | 892 | ||
896 | /* State is valid if we have some power control */ | 893 | /* State is valid if we have some power control */ |
897 | if (ps->resources.count || ps->flags.explicit_set) | 894 | if (ps->resources.count || ps->flags.explicit_set) |