Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 57ef80266e14ecc363380268fedc64e519047b4a

Authored by Frans Pop
Committed by Rafael J. Wysocki
1 parent 749b0afc3a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

PCI PM: Consistently use variable name "error" for pm call return values 

I noticed two functions use a variable "i" to store the return value of PM
function calls while the rest of the file uses "error". As "i" normally
indicates a counter of some sort it seems better to keep this consistent.

Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

drivers/pci/pci-driver.c
Diff comments   View file @ 57ef802
... ... @@ -352,17 +352,17 @@
352 352 {
353 353 struct pci_dev * pci_dev = to_pci_dev(dev);
354 354 struct pci_driver * drv = pci_dev->driver;
355   - int i = 0;
  355 + int error = 0;
356 356  
357 357 if (drv && drv->suspend) {
358 358 pci_power_t prev = pci_dev->current_state;
359 359  
360 360 pci_dev->state_saved = false;
361 361  
362   - i = drv->suspend(pci_dev, state);
363   - suspend_report_result(drv->suspend, i);
364   - if (i)
365   - return i;
  362 + error = drv->suspend(pci_dev, state);
  363 + suspend_report_result(drv->suspend, error);
  364 + if (error)
  365 + return error;
366 366  
367 367 if (pci_dev->state_saved)
368 368 goto Fixup;
369 369  
370 370  
371 371  
... ... @@ -385,20 +385,20 @@
385 385 Fixup:
386 386 pci_fixup_device(pci_fixup_suspend, pci_dev);
387 387  
388   - return i;
  388 + return error;
389 389 }
390 390  
391 391 static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
392 392 {
393 393 struct pci_dev * pci_dev = to_pci_dev(dev);
394 394 struct pci_driver * drv = pci_dev->driver;
395   - int i = 0;
  395 + int error = 0;
396 396  
397 397 if (drv && drv->suspend_late) {
398   - i = drv->suspend_late(pci_dev, state);
399   - suspend_report_result(drv->suspend_late, i);
  398 + error = drv->suspend_late(pci_dev, state);
  399 + suspend_report_result(drv->suspend_late, error);
400 400 }
401   - return i;
  401 + return error;
402 402 }
403 403  
404 404 static int pci_legacy_resume_early(struct device *dev)