[PATCH 1/4] powerpc/eeh: fix start/end/flags type in struct pci_io_addr_range{}

[Gavin Shan]

On Mon, Mar 09, 2015 at 11:17:29AM +0800, Wei Yang wrote:
>struct pci_io_addr_range{} stores the information of pci resources. It
>would be better to keep these related fields have the same type as in
>struct resource{}.
>
>This patch fixes the start/end/flags type in struct pci_io_addr_range{} to
>have the same type as in struct resource{}.
>
>Signed-off-by: Wei Yang <weiyang at linux.vnet.ibm.com>

Acked-by: Gavin Shan <gwshan at linux.vnet.ibm.com>

Thanks,
Gavin

>---
> arch/powerpc/kernel/eeh_cache.c |   16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c
>index 07d8a24..a30ed67 100644
>--- a/arch/powerpc/kernel/eeh_cache.c
>+++ b/arch/powerpc/kernel/eeh_cache.c
>@@ -48,11 +48,11 @@
>  */
> struct pci_io_addr_range {
> 	struct rb_node rb_node;
>-	unsigned long addr_lo;
>-	unsigned long addr_hi;
>+	resource_size_t addr_lo;
>+	resource_size_t addr_hi;
> 	struct eeh_dev *edev;
> 	struct pci_dev *pcidev;
>-	unsigned int flags;
>+	unsigned long flags;
> };
>
> static struct pci_io_addr_cache {
>@@ -125,8 +125,8 @@ static void eeh_addr_cache_print(struct pci_io_addr_cache *cache)
>
> /* Insert address range into the rb tree. */
> static struct pci_io_addr_range *
>-eeh_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
>-		      unsigned long ahi, unsigned int flags)
>+eeh_addr_cache_insert(struct pci_dev *dev, resource_size_t alo,
>+		      resource_size_t ahi, unsigned long flags)
> {
> 	struct rb_node **p = &pci_io_addr_cache_root.rb_root.rb_node;
> 	struct rb_node *parent = NULL;
>@@ -200,9 +200,9 @@ static void __eeh_addr_cache_insert_dev(struct pci_dev *dev)
>
> 	/* Walk resources on this device, poke them into the tree */
> 	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
>-		unsigned long start = pci_resource_start(dev,i);
>-		unsigned long end = pci_resource_end(dev,i);
>-		unsigned int flags = pci_resource_flags(dev,i);
>+		resource_size_t start = pci_resource_start(dev,i);
>+		resource_size_t end = pci_resource_end(dev,i);
>+		unsigned long flags = pci_resource_flags(dev,i);
>
> 		/* We are interested only bus addresses, not dma or other stuff */
> 		if (0 == (flags & (IORESOURCE_IO | IORESOURCE_MEM)))
>-- 
>1.7.9.5
>