2 files changed, 3 insertions, 13 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 288fc4689103..ca656b27a500 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -82,24 +82,18 @@ struct event_info {
 };
 
 struct controller {
-        struct controller *next;
         struct mutex crit_sect;         /* critical section mutex */
         struct mutex ctrl_lock;         /* controller lock */
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
         struct pci_dev *pci_dev;
         struct list_head slot_list;
-        struct slot *slot;
         struct hpc_ops *hpc_ops;
         wait_queue_head_t queue;        /* sleep & wake process */
-        u8 bus;
-        u8 device;
-        u8 function;
         u8 slot_device_offset;
         u32 first_slot;         /* First physical slot number */  /* PCIE only has 1 slot */
         u8 slot_bus;            /* Bus where the slots handled by this controller sit */
         u8 ctrlcap;
-        u16 vendor_id;
         u8 cap_base;
         struct timer_list poll_timer;
         volatile int cmd_busy;
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 310223d037aa..7f4836b8e71e 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -453,13 +453,9 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
 
         pci_set_drvdata(pdev, ctrl);
 
-        ctrl->bus = pdev->bus->number;  /* ctrl bus */
-        ctrl->slot_bus = pdev->subordinate->number;  /* bus controlled by this HPC */
-
-        ctrl->device = PCI_SLOT(pdev->devfn);
-        ctrl->function = PCI_FUNC(pdev->devfn);
-        dbg("%s: ctrl bus=0x%x, device=%x, function=%x, irq=%x\n", __FUNCTION__,
-                ctrl->bus, ctrl->device, ctrl->function, pdev->irq);
+        dbg("%s: ctrl bus=0x%x, device=%x, function=%x, irq=%x\n",
+            __FUNCTION__, pdev->bus->number, PCI_SLOT(pdev->devfn),
+            PCI_FUNC(pdev->devfn), pdev->irq);
 
         /* Setup the slot information structures */
         rc = init_slots(ctrl);