luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Frans Pop 2009-03-16 22:39:56 +01:00 committed by Rafael J. Wysocki
parent 749b0afc3a
commit 57ef80266e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/pci-driver.c
View File

@ -352,17 +352,17 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev * pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver * drv = pci_dev->driver;
int i = 0; int error = 0;
if (drv && drv->suspend) { if (drv && drv->suspend) {
pci_power_t prev = pci_dev->current_state; pci_power_t prev = pci_dev->current_state;
pci_dev->state_saved = false; pci_dev->state_saved = false;
i = drv->suspend(pci_dev, state); error = drv->suspend(pci_dev, state);
suspend_report_result(drv->suspend, i); suspend_report_result(drv->suspend, error);
if (i) if (error)
return i; return error;
if (pci_dev->state_saved) if (pci_dev->state_saved)
goto Fixup; goto Fixup;
@ -385,20 +385,20 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
Fixup: Fixup:
pci_fixup_device(pci_fixup_suspend, pci_dev); pci_fixup_device(pci_fixup_suspend, pci_dev);
return i; return error;
} }
static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev * pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver * drv = pci_dev->driver;
int i = 0; int error = 0;
if (drv && drv->suspend_late) { if (drv && drv->suspend_late) {
i = drv->suspend_late(pci_dev, state); error = drv->suspend_late(pci_dev, state);
suspend_report_result(drv->suspend_late, i); suspend_report_result(drv->suspend_late, error);
} }
return i; return error;
} }
static int pci_legacy_resume_early(struct device *dev) static int pci_legacy_resume_early(struct device *dev)