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

Commit 4ca8a772 authored by Johann Felix Soden's avatar Johann Felix Soden Committed by Jesse Barnes
Browse files

PCI: Fix printk warnings in probe.c 



The cleaned up resource code in probe.c introduced some warnings:
drivers/pci/probe.c: In function 'pci_read_bridge_bases':
drivers/pci/probe.c:386: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'resource_size_t'
drivers/pci/probe.c:386: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'resource_size_t'
drivers/pci/probe.c:398: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'resource_size_t'
drivers/pci/probe.c:398: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'resource_size_t'
drivers/pci/probe.c:434: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'resource_size_t'
drivers/pci/probe.c:434: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'resource_size_t'

So fix them up.

Signed-off-by: default avatarJohann Felix Soden <johfel@users.sourceforge.net>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent cbda1ba8

drivers/pci/probe.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -383,7 +383,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
			res->start = base;

			res->start = base;

		if (!res->end)

		if (!res->end)

			res->end = limit + 0xfff;

			res->end = limit + 0xfff;

		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);

		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n",

			pci_name(dev), (unsigned long long) res->start,

			(unsigned long long) res->end);

	}

	}





	res = child->resource[1];

	res = child->resource[1];
@@ -395,7 +397,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;

		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;

		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);

		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),

			(unsigned long long) res->start, (unsigned long long) res->end);

	}

	}





	res = child->resource[2];

	res = child->resource[2];
@@ -431,7 +434,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;

		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;

		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end);

		printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",

			pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",

			(unsigned long long) res->start, (unsigned long long) res->end);

	}

	}

}

}