PNP: increase I/O port & memory option address sizes

ACPI Address Space Descriptors can be up to 64 bits wide.
We should keep track of the whole thing when parsing resource
options, so this patch changes PNP port and mem option
fields from "unsigned short" and "unsigned int" to
"resource_size_t".

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 249b4078d1e..b09f67de13d 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -53,10 +53,12 @@ static int pnp_printf(pnp_info_buffer_t * buffer, char *fmt, ...)
 static void pnp_print_port(pnp_info_buffer_t * buffer, char *space,
                            struct pnp_port *port)
 {
-        pnp_printf(buffer,
-                   "%sport 0x%x-0x%x, align 0x%x, size 0x%x, %i-bit address decoding\n",
-                   space, port->min, port->max,
-                   port->align ? (port->align - 1) : 0, port->size,
+        pnp_printf(buffer, "%sport %#llx-%#llx, align %#llx, size %#llx, "
+                   "%i-bit address decoding\n", space,
+                   (unsigned long long) port->min,
+                   (unsigned long long) port->max,
+                   port->align ? ((unsigned long long) port->align - 1) : 0,
+                   (unsigned long long) port->size,
                    port->flags & IORESOURCE_IO_16BIT_ADDR ? 16 : 10);
 }
 
@@ -148,8 +150,11 @@ static void pnp_print_mem(pnp_info_buffer_t * buffer, char *space,
 {
         char *s;
 
-        pnp_printf(buffer, "%sMemory 0x%x-0x%x, align 0x%x, size 0x%x",
-                   space, mem->min, mem->max, mem->align, mem->size);
+        pnp_printf(buffer, "%sMemory %#llx-%#llx, align %#llx, size %#llx",
+                   space, (unsigned long long) mem->min,
+                   (unsigned long long) mem->max,
+                   (unsigned long long) mem->align,
+                   (unsigned long long) mem->size);
         if (mem->flags & IORESOURCE_MEM_WRITEABLE)
                 pnp_printf(buffer, ", writeable");
         if (mem->flags & IORESOURCE_MEM_CACHEABLE)