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

Commit 14add80b authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes
Browse files

PCI: remove unnecessary arg of pci_update_resource() 



This cleanup removes unnecessary argument 'struct resource *res' in
pci_update_resource(), so it takes same arguments as other companion
functions (pci_assign_resource(), etc.).

Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 6a49d812

drivers/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ pci_restore_bars(struct pci_dev *dev) 
	}



	for (i = 0; i < numres; i++)

		pci_update_resource(dev, &dev->resource[i], i);

		pci_update_resource(dev, i);

}



static struct pci_platform_pm_ops *pci_platform_pm;

drivers/pci/setup-res.c

+4 −3
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ 
#include "pci.h"





void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)

void pci_update_resource(struct pci_dev *dev, int resno)

{

	struct pci_bus_region region;

	u32 new, check, mask;

	int reg;

	struct resource *res = dev->resource + resno;



	/*

	 * Ignore resources for unimplemented BARs and unused resource slots
@@ -162,7 +163,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) 
	} else {

		res->flags &= ~IORESOURCE_STARTALIGN;

		if (resno < PCI_BRIDGE_RESOURCES)

			pci_update_resource(dev, res, resno);

			pci_update_resource(dev, resno);

	}



	return ret;
@@ -197,7 +198,7 @@ int pci_assign_resource_fixed(struct pci_dev *dev, int resno) 
		dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",

			resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);

	} else if (resno < PCI_BRIDGE_RESOURCES) {

		pci_update_resource(dev, res, resno);

		pci_update_resource(dev, resno);

	}



	return ret;

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ int pcie_get_readrq(struct pci_dev *dev); 
int pcie_set_readrq(struct pci_dev *dev, int rq);

int pci_reset_function(struct pci_dev *dev);

int pci_execute_reset_function(struct pci_dev *dev);

void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);

void pci_update_resource(struct pci_dev *dev, int resno);

int __must_check pci_assign_resource(struct pci_dev *dev, int i);

int pci_select_bars(struct pci_dev *dev, unsigned long flags);