Commit 02992064 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bjorn Helgaas
Browse files

PCI: Make pci_bus_for_each_resource() index optional 

Refactor pci_bus_for_each_resource() in the same way as
pci_dev_for_each_resource(). This allows the index to be hidden inside the
implementation so the caller can omit it when it's not used otherwise.

No functional changes intended.

Link: https://lore.kernel.org/r/20230330162434.35055-6-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKrzysztof Wilczyński <kw@linux.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
parent ceb928be

drivers/pci/bus.c

+3 −4
Original line number Diff line number Diff line
@@ -161,13 +161,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, 
		void *alignf_data,

		struct pci_bus_region *region)

{

	int i, ret;

	struct resource *r, avail;

	resource_size_t max;

	int ret;



	type_mask |= IORESOURCE_TYPE_BITS;



	pci_bus_for_each_resource(bus, r, i) {

	pci_bus_for_each_resource(bus, r) {

		resource_size_t min_used = min;



		if (!r)
@@ -268,9 +268,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) 
	struct resource *res = &dev->resource[idx];

	struct resource orig_res = *res;

	struct resource *r;

	int i;



	pci_bus_for_each_resource(bus, r, i) {

	pci_bus_for_each_resource(bus, r) {

		resource_size_t start, end;



		if (!r)

drivers/pci/hotplug/shpchp_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ 
static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pci_dev *pdev;

	int index, busnr;

	struct resource *res;

	struct pci_bus *bus;

	size_t len = 0;

	int busnr;



	pdev = to_pci_dev(dev);

	bus = pdev->subordinate;



	len += sysfs_emit_at(buf, len, "Free resources: memory\n");

	pci_bus_for_each_resource(bus, res, index) {

	pci_bus_for_each_resource(bus, res) {

		if (res && (res->flags & IORESOURCE_MEM) &&

				!(res->flags & IORESOURCE_PREFETCH)) {

			len += sysfs_emit_at(buf, len,
@@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char 
		}

	}

	len += sysfs_emit_at(buf, len, "Free resources: prefetchable memory\n");

	pci_bus_for_each_resource(bus, res, index) {

	pci_bus_for_each_resource(bus, res) {

		if (res && (res->flags & IORESOURCE_MEM) &&

			       (res->flags & IORESOURCE_PREFETCH)) {

			len += sysfs_emit_at(buf, len,
@@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char 
		}

	}

	len += sysfs_emit_at(buf, len, "Free resources: IO\n");

	pci_bus_for_each_resource(bus, res, index) {

	pci_bus_for_each_resource(bus, res) {

		if (res && (res->flags & IORESOURCE_IO)) {

			len += sysfs_emit_at(buf, len,

					     "start = %8.8llx, length = %8.8llx\n",

drivers/pci/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, 
{

	const struct pci_bus *bus = dev->bus;

	struct resource *r;

	int i;



	pci_bus_for_each_resource(bus, r, i) {

	pci_bus_for_each_resource(bus, r) {

		if (!r)

			continue;

		if (resource_contains(r, res)) {

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child) 
	pci_read_bridge_mmio_pref(child);



	if (dev->transparent) {

		pci_bus_for_each_resource(child->parent, res, i) {

		pci_bus_for_each_resource(child->parent, res) {

			if (res && res->flags) {

				pci_bus_add_resource(child, res,

						     PCI_SUBTRACTIVE_DECODE);

drivers/pci/setup-bus.c

+4 −6
Original line number Diff line number Diff line
@@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struct pci_bus *bus, 
						  unsigned long type)

{

	struct resource *r, *r_assigned = NULL;

	int i;



	pci_bus_for_each_resource(bus, r, i) {

	pci_bus_for_each_resource(bus, r) {

		if (r == &ioport_resource || r == &iomem_resource)

			continue;

		if (r && (r->flags & type_mask) == type && !r->parent)
@@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) 
			additional_mmio_pref_size = 0;

	struct resource *pref;

	struct pci_host_bridge *host;

	int hdr_type, i, ret;

	int hdr_type, ret;



	list_for_each_entry(dev, &bus->devices, bus_list) {

		struct pci_bus *b = dev->subordinate;
@@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) 
		host = to_pci_host_bridge(bus->bridge);

		if (!host->size_windows)

			return;

		pci_bus_for_each_resource(bus, pref, i)

		pci_bus_for_each_resource(bus, pref)

			if (pref && (pref->flags & IORESOURCE_PREFETCH))

				break;

		hdr_type = -1;	/* Intentionally invalid - not a PCI device. */
@@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges); 


static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)

{

	int i;

	struct resource *parent_r;

	unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM |

			     IORESOURCE_PREFETCH;



	pci_bus_for_each_resource(b, parent_r, i) {

	pci_bus_for_each_resource(b, parent_r) {

		if (!parent_r)

			continue;