Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ef8026 authored by Frans Pop's avatar Frans Pop Committed by Rafael J. Wysocki
Browse files

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: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 749b0afc

drivers/pci/pci-driver.c

+10 −10
Original line number Diff line number Diff line
@@ -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_driver * drv = pci_dev->driver;

	int i = 0;

	int error = 0;



	if (drv && drv->suspend) {

		pci_power_t prev = pci_dev->current_state;



		pci_dev->state_saved = false;



		i = drv->suspend(pci_dev, state);

		suspend_report_result(drv->suspend, i);

		if (i)

			return i;

		error = drv->suspend(pci_dev, state);

		suspend_report_result(drv->suspend, error);

		if (error)

			return error;



		if (pci_dev->state_saved)

			goto Fixup;
@@ -385,20 +385,20 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) 
 Fixup:

	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)

{

	struct pci_dev * pci_dev = to_pci_dev(dev);

	struct pci_driver * drv = pci_dev->driver;

	int i = 0;

	int error = 0;



	if (drv && drv->suspend_late) {

		i = drv->suspend_late(pci_dev, state);

		suspend_report_result(drv->suspend_late, i);

		error = drv->suspend_late(pci_dev, state);

		suspend_report_result(drv->suspend_late, error);

	}

	return i;

	return error;

}



static int pci_legacy_resume_early(struct device *dev)