From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Westerberg Subject: Re: [RFC][PATCH 6/8] ACPI / hotplug / PCI: Drop acpiphp_handle_to_bridge() Date: Tue, 9 Jul 2013 12:37:26 +0300 Message-ID: <20130709093726.GK4898@intel.com> References: <26431283.HJCKsss0rt@vostro.rjw.lan> <3804403.VVlzfJfUyu@vostro.rjw.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <3804403.VVlzfJfUyu@vostro.rjw.lan> Sender: linux-pci-owner@vger.kernel.org To: "Rafael J. Wysocki" Cc: ACPI Devel Maling List , Bjorn Helgaas , LKML , Linux PCI , Yinghai Lu , Jiang Liu List-Id: linux-acpi@vger.kernel.org On Tue, Jul 09, 2013 at 02:20:31AM +0200, Rafael J. Wysocki wrote: > @@ -953,37 +937,49 @@ static void acpiphp_sanitize_bus(struct > * ACPI event handlers > */ > > -static acpi_status > -check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv) > +static acpi_status check_sub_bridges(acpi_handle handle, u32 lvl, void *data, > + void **rv) > { > - struct acpiphp_bridge *bridge; > - char objname[64]; > - struct acpi_buffer buffer = { .length = sizeof(objname), > - .pointer = objname }; > + struct acpiphp_context *context = acpiphp_get_context(handle); > + > + if (!context) > + return AE_OK; > > - bridge = acpiphp_handle_to_bridge(handle); > - if (bridge) { > + if (context->bridge) { > + struct acpiphp_bridge *bridge = context->bridge; > + char objname[64]; > + struct acpi_buffer buffer = { .length = sizeof(objname), > + .pointer = objname }; > + > + get_bridge(bridge); > acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); > - dbg("%s: re-enumerating slots under %s\n", > - __func__, objname); > + dbg("%s: re-enumerating slots under %s\n", __func__, objname); Although not related to this patch directly, how about using acpi_handle_debug() or similar here? > acpiphp_check_bridge(bridge); > put_bridge(bridge); > } > + acpiphp_put_context(context); > return AE_OK ; > }