diff options
Diffstat (limited to 'drivers/pci/pcie/portdrv_pci.c')
-rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index e4a2429986f0..037690e08f5f 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
@@ -147,8 +147,10 @@ static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev, | |||
147 | { | 147 | { |
148 | struct aer_broadcast_data result_data = | 148 | struct aer_broadcast_data result_data = |
149 | {error, PCI_ERS_RESULT_CAN_RECOVER}; | 149 | {error, PCI_ERS_RESULT_CAN_RECOVER}; |
150 | int retval; | ||
150 | 151 | ||
151 | device_for_each_child(&dev->dev, &result_data, error_detected_iter); | 152 | /* can not fail */ |
153 | retval = device_for_each_child(&dev->dev, &result_data, error_detected_iter); | ||
152 | 154 | ||
153 | return result_data.result; | 155 | return result_data.result; |
154 | } | 156 | } |
@@ -181,8 +183,10 @@ static int mmio_enabled_iter(struct device *device, void *data) | |||
181 | static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev) | 183 | static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev) |
182 | { | 184 | { |
183 | pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; | 185 | pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; |
186 | int retval; | ||
184 | 187 | ||
185 | device_for_each_child(&dev->dev, &status, mmio_enabled_iter); | 188 | /* get true return value from &status */ |
189 | retval = device_for_each_child(&dev->dev, &status, mmio_enabled_iter); | ||
186 | return status; | 190 | return status; |
187 | } | 191 | } |
188 | 192 | ||
@@ -214,6 +218,7 @@ static int slot_reset_iter(struct device *device, void *data) | |||
214 | static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) | 218 | static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) |
215 | { | 219 | { |
216 | pci_ers_result_t status; | 220 | pci_ers_result_t status; |
221 | int retval; | ||
217 | 222 | ||
218 | /* If fatal, restore cfg space for possible link reset at upstream */ | 223 | /* If fatal, restore cfg space for possible link reset at upstream */ |
219 | if (dev->error_state == pci_channel_io_frozen) { | 224 | if (dev->error_state == pci_channel_io_frozen) { |
@@ -221,7 +226,8 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) | |||
221 | pci_enable_pcie_error_reporting(dev); | 226 | pci_enable_pcie_error_reporting(dev); |
222 | } | 227 | } |
223 | 228 | ||
224 | device_for_each_child(&dev->dev, &status, slot_reset_iter); | 229 | /* get true return value from &status */ |
230 | retval = device_for_each_child(&dev->dev, &status, slot_reset_iter); | ||
225 | 231 | ||
226 | return status; | 232 | return status; |
227 | } | 233 | } |
@@ -248,7 +254,9 @@ static int resume_iter(struct device *device, void *data) | |||
248 | 254 | ||
249 | static void pcie_portdrv_err_resume(struct pci_dev *dev) | 255 | static void pcie_portdrv_err_resume(struct pci_dev *dev) |
250 | { | 256 | { |
251 | device_for_each_child(&dev->dev, NULL, resume_iter); | 257 | int retval; |
258 | /* nothing to do with error value, if it ever happens */ | ||
259 | retval = device_for_each_child(&dev->dev, NULL, resume_iter); | ||
252 | } | 260 | } |
253 | 261 | ||
254 | /* | 262 | /* |