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 ; > } -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html