aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-12 13:18:01 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-04-15 12:56:27 -0400
commitb638d7e7b849ad402aaecfe7edb599687b5eb3a8 (patch)
treeed295c912fa9448fe0b32cdbe062c4d36eb3f61a /drivers/pci/pcie
parentc3139ba212ddc240656f4bcfc7c946418cd83e19 (diff)
PCI: Remove unused variables
This fixes "set but not used" warnings found via "make W=1". Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r--drivers/pci/pcie/portdrv_pci.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 08c243ab034e..0efba0539cc9 100644
--- 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,
272 enum pci_channel_state error) 272 enum pci_channel_state error)
273{ 273{
274 struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER}; 274 struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};
275 int ret;
276
277 /* can not fail */
278 ret = device_for_each_child(&dev->dev, &data, error_detected_iter);
279 275
276 /* get true return value from &data */
277 device_for_each_child(&dev->dev, &data, error_detected_iter);
280 return data.result; 278 return data.result;
281} 279}
282 280
@@ -308,10 +306,9 @@ static int mmio_enabled_iter(struct device *device, void *data)
308static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev) 306static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
309{ 307{
310 pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; 308 pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
311 int retval;
312 309
313 /* get true return value from &status */ 310 /* get true return value from &status */
314 retval = device_for_each_child(&dev->dev, &status, mmio_enabled_iter); 311 device_for_each_child(&dev->dev, &status, mmio_enabled_iter);
315 return status; 312 return status;
316} 313}
317 314
@@ -343,7 +340,6 @@ static int slot_reset_iter(struct device *device, void *data)
343static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) 340static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
344{ 341{
345 pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; 342 pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
346 int retval;
347 343
348 /* If fatal, restore cfg space for possible link reset at upstream */ 344 /* If fatal, restore cfg space for possible link reset at upstream */
349 if (dev->error_state == pci_channel_io_frozen) { 345 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)
354 } 350 }
355 351
356 /* get true return value from &status */ 352 /* get true return value from &status */
357 retval = device_for_each_child(&dev->dev, &status, slot_reset_iter); 353 device_for_each_child(&dev->dev, &status, slot_reset_iter);
358
359 return status; 354 return status;
360} 355}
361 356
@@ -381,9 +376,7 @@ static int resume_iter(struct device *device, void *data)
381 376
382static void pcie_portdrv_err_resume(struct pci_dev *dev) 377static void pcie_portdrv_err_resume(struct pci_dev *dev)
383{ 378{
384 int retval; 379 device_for_each_child(&dev->dev, NULL, resume_iter);
385 /* nothing to do with error value, if it ever happens */
386 retval = device_for_each_child(&dev->dev, NULL, resume_iter);
387} 380}
388 381
389/* 382/*