[PATCH] shpchp: Remove unused pci_bus member from controller structure

This patch removes unused 'pci_bus' member from controller structure.
This patch have no functional change.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 1 insertions, 13 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index dc12b0dbb9b2..ce792b3cf9de 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -85,7 +85,6 @@ struct controller {
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
         struct pci_dev *pci_dev;
-        struct pci_bus *pci_bus;
         struct event_info event_queue[10];
         struct list_head slot_list;
         struct hpc_ops *hpc_ops;
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index cb4ac43ea95c..8b21fc206712 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -386,14 +386,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, ctrl);
 
-        ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
-        if (!ctrl->pci_bus) {
-                err("out of memory\n");
-                rc = -ENOMEM;
-                goto err_out_unmap_mmio_region;
-        }
-
-        memcpy (ctrl->pci_bus, pdev->bus, sizeof (*ctrl->pci_bus));
         ctrl->bus = pdev->bus->number;
         ctrl->slot_bus = pdev->subordinate->number;
         ctrl->device = PCI_SLOT(pdev->devfn);
@@ -408,7 +400,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         rc = get_ctlr_slot_config(ctrl);
         if (rc) {
                 err(msg_initialization_err, rc);
-                goto err_out_free_ctrl_bus;
+                goto err_out_unmap_mmio_region;
         }
         first_device_num = ctrl->slot_device_offset;
         num_ctlr_slots = ctrl->num_slots;
@@ -446,8 +438,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 err_out_free_ctrl_slot:
         cleanup_slots(ctrl);
-err_out_free_ctrl_bus:
-        kfree(ctrl->pci_bus);
 err_out_unmap_mmio_region:
         ctrl->hpc_ops->release_ctlr(ctrl);
 err_out_free_ctrl:
@@ -481,7 +471,6 @@ static void __exit unload_shpchpd(void)
                 ctrl = list_entry(tmp, struct controller, ctrl_list);
                 shpchp_remove_ctrl_files(ctrl);
                 cleanup_slots(ctrl);
-                kfree (ctrl->pci_bus);
                 ctrl->hpc_ops->release_ctlr(ctrl);
                 kfree(ctrl);
         }