PCI: Remove unused variables

This fixes "set but not used" warnings found via "make W=1".

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 6a25f4d8ba326c46502a8eb84a26b87eb7fd151e..9d4c199a64befab7d4a2649cd0d75e9d7687bdad 100644 (file)
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -520,10 +520,8 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
 int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug,
                                         struct hotplug_slot_info *info)
 {
-       struct pci_slot *slot;
        if (!hotplug || !info)
                return -ENODEV;
-       slot = hotplug->pci_slot;
 
        memcpy(hotplug->info, info, sizeof(struct hotplug_slot_info));
 

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 08c243ab034e9bc9172dfd593f4cb0ceabbe2f60..0efba0539cc9e66c28d7d424507c611d1b1a8b98 100644 (file)
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -272,11 +272,9 @@ static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,
                                        enum pci_channel_state error)
 {
        struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};
-       int ret;
-
-       /* can not fail */
-       ret = device_for_each_child(&dev->dev, &data, error_detected_iter);
 
+       /* get true return value from &data */
+       device_for_each_child(&dev->dev, &data, error_detected_iter);
        return data.result;
 }
 
@@ -308,10 +306,9 @@ static int mmio_enabled_iter(struct device *device, void *data)
 static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
 {
        pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
-       int retval;
 
        /* get true return value from &status */
-       retval = device_for_each_child(&dev->dev, &status, mmio_enabled_iter);
+       device_for_each_child(&dev->dev, &status, mmio_enabled_iter);
        return status;
 }
 
@@ -343,7 +340,6 @@ static int slot_reset_iter(struct device *device, void *data)
 static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
 {
        pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
-       int retval;
 
        /* If fatal, restore cfg space for possible link reset at upstream */
        if (dev->error_state == pci_channel_io_frozen) {
@@ -354,8 +350,7 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
        }
 
        /* get true return value from &status */
-       retval = device_for_each_child(&dev->dev, &status, slot_reset_iter);
-
+       device_for_each_child(&dev->dev, &status, slot_reset_iter);
        return status;
 }
 
@@ -381,9 +376,7 @@ static int resume_iter(struct device *device, void *data)
 
 static void pcie_portdrv_err_resume(struct pci_dev *dev)
 {
-       int retval;
-       /* nothing to do with error value, if it ever happens */
-       retval = device_for_each_child(&dev->dev, NULL, resume_iter);
+       device_for_each_child(&dev->dev, NULL, resume_iter);
 }
 
 /*

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 81b88bda79307b9003f37d5eb36699342f75383d..07f2eddc09cefec8dd6a742b0f5a1f659cb6080c 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -261,7 +261,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
 {
        struct resource *res = dev->resource + resno;
        resource_size_t align, size;
-       struct pci_bus *bus;
        int ret;
 
        align = pci_resource_alignment(dev, res);
@@ -271,7 +270,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
                return -EINVAL;
        }
 
-       bus = dev->bus;
        size = resource_size(res);
        ret = _pci_assign_resource(dev, resno, size, align);