Merge branch 'master' into 83xx

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 16167b016266c0499cd4c9f26900b0f48ba5c76e..fca978fb158e22e5313ebf8564faf09ee6bae160 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -773,13 +773,13 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base)
                goto out;
 
        table = obj->buffer.pointer;
-       switch (((acpi_table_entry_header *)table)->type) {
-       case ACPI_MADT_IOSAPIC:
-               *gsi_base = ((struct acpi_table_iosapic *)table)->global_irq_base;
+       switch (((struct acpi_subtable_header *)table)->type) {
+       case ACPI_MADT_TYPE_IO_SAPIC:
+               *gsi_base = ((struct acpi_madt_io_sapic *)table)->global_irq_base;
                result = 0;
                break;
-       case ACPI_MADT_IOAPIC:
-               *gsi_base = ((struct acpi_table_ioapic *)table)->global_irq_base;
+       case ACPI_MADT_TYPE_IO_APIC:
+               *gsi_base = ((struct acpi_madt_io_apic *)table)->global_irq_base;
                result = 0;
                break;
        default:
@@ -1682,7 +1682,7 @@ int __init acpiphp_glue_init(void)
  *
  * This function frees all data allocated in acpiphp_glue_init()
  */
-void __exit acpiphp_glue_exit(void)
+void  acpiphp_glue_exit(void)
 {
        acpi_pci_unregister_driver(&acpi_pci_hp_driver);
 }
@@ -1693,14 +1693,10 @@ void __exit acpiphp_glue_exit(void)
  */
 int __init acpiphp_get_num_slots(void)
 {
-       struct list_head *node;
        struct acpiphp_bridge *bridge;
-       int num_slots;
-
-       num_slots = 0;
+       int num_slots = 0;
 
-       list_for_each (node, &bridge_list) {
-               bridge = (struct acpiphp_bridge *)node;
+       list_for_each_entry (bridge, &bridge_list, list) {
                dbg("Bus %04x:%02x has %d slot%s\n",
                                pci_domain_nr(bridge->pci_bus),
                                bridge->pci_bus->number, bridge->nr_slots,