Merge tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[karo-tx-linux.git] / drivers / pci / pcie / portdrv_pci.c

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index ed4d0949833796869f9d7713909e0323a611609a..696caed5fdf557198db4bef5201df2a6c04c83d2 100644 (file)
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -259,11 +259,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;
 }
 
@@ -295,10 +293,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;
 }
 
@@ -330,7 +327,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) {
@@ -341,8 +337,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;
 }
 
@@ -368,9 +363,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);
 }
 
 /*