From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: [PATCH 70/76] ACPI: Clean redundant codes in scan.c Date: Fri, 30 Mar 2012 06:14:13 -0400 Message-ID: <37239978778806ecba54da60676abb46870acebb.1333101989.git.len.brown@intel.com> References: <1333102459-23750-1-git-send-email-lenb@kernel.org> Reply-To: Len Brown Return-path: In-reply-to: <1333102459-23750-1-git-send-email-lenb@kernel.org> In-reply-to: <09f98a825a821f7a3f1b162f9ed023f37213a63b.1333101989.git.len.brown@intel.com> References: <09f98a825a821f7a3f1b162f9ed023f37213a63b.1333101989.git.len.brown@intel.com> Sender: linux-acpi-owner@vger.kernel.org To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Alex He , Len Brown List-Id: linux-pm@vger.kernel.org From: Alex He Clean the redundant codes of apci_bus_get_power_flags(). Signed-off-by: Alex He Signed-off-by: Len Brown --- drivers/acpi/scan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8ab80ba..5d24a17 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) int j; device->power.flags.power_resources = 1; - ps->flags.valid = 1; for (j = 0; j < ps->resources.count; j++) acpi_bus_add_power_resource(ps->resources.handles[j]); } @@ -888,10 +887,8 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) /* Evaluate "_PSx" to see if we can do explicit sets */ object_name[2] = 'S'; status = acpi_get_handle(device->handle, object_name, &handle); - if (ACPI_SUCCESS(status)) { + if (ACPI_SUCCESS(status)) ps->flags.explicit_set = 1; - ps->flags.valid = 1; - } /* State is valid if we have some power control */ if (ps->resources.count || ps->flags.explicit_set) -- 1.7.10.rc2.19.gfae9d