PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge

We always look up hotplug_params with decode_hpp() immediately before using
them, so we don't need to save them in the acpiphp_bridge struct.  This
patch follows the example of program_fw_provided_values() in pciehp_pci.c
and shpchp_pci.c by just keeping the params on the stack while we need them.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Alex Chiang <achiang@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

2 files changed, 27 insertions, 34 deletions

diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index e68d5f20ffb3..7d938df79206 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -91,9 +91,6 @@ struct acpiphp_bridge {
         /* PCI-to-PCI bridge device */
         struct pci_dev *pci_dev;
 
-        /* ACPI 2.0 _HPP parameters */
-        struct hotplug_params hpp;
-
         spinlock_t res_lock;
 };
 
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index e0623373615f..db81c08de8d5 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -59,7 +59,7 @@ static DEFINE_SPINLOCK(ioapic_list_lock);
 
 static void handle_hotplug_event_bridge (acpi_handle, u32, void *);
 static void acpiphp_sanitize_bus(struct pci_bus *bus);
-static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);
+static void acpiphp_set_hpp_values(struct pci_bus *bus);
 static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context);
 
 /* callback routine to check for the existence of a pci dock device */
@@ -273,23 +273,23 @@ static int detect_ejectable_slots(acpi_handle handle)
 
 
 /* decode ACPI 2.0 _HPP hot plug parameters */
-static void decode_hpp(struct acpiphp_bridge *bridge)
+static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
 {
         acpi_status status;
 
-        status = acpi_get_hp_params_from_firmware(bridge->pci_bus, &bridge->hpp);
+        status = acpi_get_hp_params_from_firmware(dev->bus, hpp);
         if (ACPI_FAILURE(status) ||
-            !bridge->hpp.t0 || (bridge->hpp.t0->revision > 1)) {
+            !hpp->t0 || (hpp->t0->revision > 1)) {
                 /* use default numbers */
                 printk(KERN_WARNING
                        "%s: Could not get hotplug parameters. Use defaults\n",
                        __func__);
-                bridge->hpp.t0 = &bridge->hpp.type0_data;
-                bridge->hpp.t0->revision = 0;
-                bridge->hpp.t0->cache_line_size = 0x10;
-                bridge->hpp.t0->latency_timer = 0x40;
-                bridge->hpp.t0->enable_serr = 0;
-                bridge->hpp.t0->enable_perr = 0;
+                hpp->t0 = &hpp->type0_data;
+                hpp->t0->revision = 0;
+                hpp->t0->cache_line_size = 0x10;
+                hpp->t0->latency_timer = 0x40;
+                hpp->t0->enable_serr = 0;
+                hpp->t0->enable_perr = 0;
         }
 }
 
@@ -1037,7 +1037,7 @@ static int __ref enable_device(struct acpiphp_slot *slot)
 
         pci_bus_assign_resources(bus);
         acpiphp_sanitize_bus(bus);
-        acpiphp_set_hpp_values(slot->bridge->handle, bus);
+        acpiphp_set_hpp_values(bus);
         list_for_each_entry(func, &slot->funcs, sibling)
                 acpiphp_configure_ioapics(func->handle);
         pci_enable_bridges(bus);
@@ -1248,7 +1248,7 @@ static int acpiphp_check_bridge(struct acpiphp_bridge *bridge)
         return retval;
 }
 
-static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)
+static void program_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
 {
         u16 pci_cmd, pci_bctl;
         struct pci_dev *cdev;
@@ -1263,15 +1263,15 @@ static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)
                 return;
 
         pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
-                        bridge->hpp.t0->cache_line_size);
+                        hpp->t0->cache_line_size);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER,
-                        bridge->hpp.t0->latency_timer);
+                        hpp->t0->latency_timer);
         pci_read_config_word(dev, PCI_COMMAND, &pci_cmd);
-        if (bridge->hpp.t0->enable_serr)
+        if (hpp->t0->enable_serr)
                 pci_cmd |= PCI_COMMAND_SERR;
         else
                 pci_cmd &= ~PCI_COMMAND_SERR;
-        if (bridge->hpp.t0->enable_perr)
+        if (hpp->t0->enable_perr)
                 pci_cmd |= PCI_COMMAND_PARITY;
         else
                 pci_cmd &= ~PCI_COMMAND_PARITY;
@@ -1280,13 +1280,13 @@ static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)
         /* Program bridge control value and child devices */
         if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                 pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,
-                                bridge->hpp.t0->latency_timer);
+                                hpp->t0->latency_timer);
                 pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &pci_bctl);
-                if (bridge->hpp.t0->enable_serr)
+                if (hpp->t0->enable_serr)
                         pci_bctl |= PCI_BRIDGE_CTL_SERR;
                 else
                         pci_bctl &= ~PCI_BRIDGE_CTL_SERR;
-                if (bridge->hpp.t0->enable_perr)
+                if (hpp->t0->enable_perr)
                         pci_bctl |= PCI_BRIDGE_CTL_PARITY;
                 else
                         pci_bctl &= ~PCI_BRIDGE_CTL_PARITY;
@@ -1294,24 +1294,20 @@ static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)
                 if (dev->subordinate) {
                         list_for_each_entry(cdev, &dev->subordinate->devices,
                                         bus_list)
-                                program_hpp(cdev, bridge);
+                                program_hpp(cdev, hpp);
                 }
         }
 }
 
-static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus)
+static void acpiphp_set_hpp_values(struct pci_bus *bus)
 {
-        struct acpiphp_bridge bridge;
         struct pci_dev *dev;
+        struct hotplug_params hpp;
 
-        memset(&bridge, 0, sizeof(bridge));
-        bridge.handle = handle;
-        bridge.pci_bus = bus;
-        bridge.pci_dev = bus->self;
-        decode_hpp(&bridge);
-        list_for_each_entry(dev, &bus->devices, bus_list)
-                program_hpp(dev, &bridge);
-
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                decode_hpp(dev, &hpp);
+                program_hpp(dev, &hpp);
+        }
 }
 
 /*
@@ -1355,7 +1351,7 @@ static int acpiphp_configure_bridge (acpi_handle handle)
         pci_bus_size_bridges(bus);
         pci_bus_assign_resources(bus);
         acpiphp_sanitize_bus(bus);
-        acpiphp_set_hpp_values(handle, bus);
+        acpiphp_set_hpp_values(bus);
         pci_enable_bridges(bus);
         acpiphp_configure_ioapics(handle);
         return 0;