From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yasuaki Ishimatsu Subject: Re: [PATCH 2/2] ACPI / scan: Clean up acpi_bus_get_parent() Date: Thu, 31 Jan 2013 12:41:30 +0900 Message-ID: <5109E7EA.5010507@jp.fujitsu.com> References: <1451967.YMyGeCCNtu@vostro.rjw.lan> <7667918.svVNymu9rt@vostro.rjw.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:52002 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755496Ab3AaDmF (ORCPT ); Wed, 30 Jan 2013 22:42:05 -0500 In-Reply-To: <7667918.svVNymu9rt@vostro.rjw.lan> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: "Rafael J. Wysocki" Cc: ACPI Devel Maling List , LKML , Mika Westerberg , Yinghai Lu , Toshi Kani 2013/01/31 7:04, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Make acpi_bus_get_parent() more straightforward and remove an > unnecessary local variable ret from it. > > Signed-off-by: Rafael J. Wysocki > --- Acked-by: Yasuaki Ishimatsu > drivers/acpi/scan.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > Index: test/drivers/acpi/scan.c > =================================================================== > --- test.orig/drivers/acpi/scan.c > +++ test/drivers/acpi/scan.c > @@ -871,29 +871,23 @@ EXPORT_SYMBOL(acpi_bus_unregister_driver > -------------------------------------------------------------------------- */ > static struct acpi_device *acpi_bus_get_parent(acpi_handle handle) > { > + struct acpi_device *device = NULL; > acpi_status status; > - int ret; > - struct acpi_device *device; > > /* > * Fixed hardware devices do not appear in the namespace and do not > * have handles, but we fabricate acpi_devices for them, so we have > * to deal with them specially. > */ > - if (handle == NULL) > + if (!handle) > return acpi_root; > > do { > status = acpi_get_parent(handle, &handle); > - if (status == AE_NULL_ENTRY) > - return NULL; > if (ACPI_FAILURE(status)) > - return acpi_root; > - > - ret = acpi_bus_get_device(handle, &device); > - if (ret == 0) > - return device; > - } while (1); > + return status == AE_NULL_ENTRY ? NULL : acpi_root; > + } while (acpi_bus_get_device(handle, &device)); > + return device; > } > > acpi_status > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >