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

Commit 1d3c16a8 authored by Jon Mason's avatar Jon Mason Committed by Jesse Barnes
Browse files

PCI: make pci_restore_state return void 



pci_restore_state only ever returns 0, thus there is no benefit in
having it return any value.  Also, a large majority of the callers do
not check the return code of pci_restore_state.  Make the
pci_restore_state a void return and avoid the overhead.

Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarJon Mason <jon.mason@exar.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 2f671e2d

drivers/media/video/cafe_ccic.c

+1 −3
Original line number Diff line number Diff line
@@ -2186,9 +2186,7 @@ static int cafe_pci_resume(struct pci_dev *pdev) 
	struct cafe_camera *cam = to_cam(v4l2_dev);

	int ret = 0;



	ret = pci_restore_state(pdev);

	if (ret)

		return ret;

	pci_restore_state(pdev);

	ret = pci_enable_device(pdev);



	if (ret) {

drivers/net/myri10ge/myri10ge.c

+1 −3
Original line number Diff line number Diff line
@@ -3403,9 +3403,7 @@ static int myri10ge_resume(struct pci_dev *pdev) 
		return -EIO;

	}



	status = pci_restore_state(pdev);

	if (status)

		return status;

	pci_restore_state(pdev);



	status = pci_enable_device(pdev);

	if (status) {

drivers/net/sfc/falcon.c

+5 −20
Original line number Diff line number Diff line
@@ -1066,22 +1066,9 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method) 


	/* Restore PCI configuration if needed */

	if (method == RESET_TYPE_WORLD) {

		if (efx_nic_is_dual_func(efx)) {

			rc = pci_restore_state(nic_data->pci_dev2);

			if (rc) {

				netif_err(efx, drv, efx->net_dev,

					  "failed to restore PCI config for "

					  "the secondary function\n");

				goto fail3;

			}

		}

		rc = pci_restore_state(efx->pci_dev);

		if (rc) {

			netif_err(efx, drv, efx->net_dev,

				  "failed to restore PCI config for the "

				  "primary function\n");

			goto fail4;

		}

		if (efx_nic_is_dual_func(efx))

			pci_restore_state(nic_data->pci_dev2);

		pci_restore_state(efx->pci_dev);

		netif_dbg(efx, drv, efx->net_dev,

			  "successfully restored PCI config\n");

	}
@@ -1092,7 +1079,7 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method) 
		rc = -ETIMEDOUT;

		netif_err(efx, hw, efx->net_dev,

			  "timed out waiting for hardware reset\n");

		goto fail5;

		goto fail3;

	}

	netif_dbg(efx, hw, efx->net_dev, "hardware reset complete\n");
@@ -1100,11 +1087,9 @@ static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method) 


	/* pci_save_state() and pci_restore_state() MUST be called in pairs */

fail2:

fail3:

	pci_restore_state(efx->pci_dev);

fail1:

fail4:

fail5:

fail3:

	return rc;

}

drivers/net/skge.c

+1 −3
Original line number Diff line number Diff line
@@ -4087,9 +4087,7 @@ static int skge_resume(struct pci_dev *pdev) 
	if (err)

		goto out;



	err = pci_restore_state(pdev);

	if (err)

		goto out;

	pci_restore_state(pdev);



	err = skge_reset(hw);

	if (err)

drivers/net/sky2.c

+1 −4
Original line number Diff line number Diff line
@@ -4969,10 +4969,7 @@ static int sky2_resume(struct pci_dev *pdev) 
	if (err)

		goto out;



	err = pci_restore_state(pdev);

	if (err)

		goto out;



	pci_restore_state(pdev);

	pci_enable_wake(pdev, PCI_D0, 0);



	/* Re-enable all clocks */