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

Commit 490ab72a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] 64bit resource: fix up printks for resources in pcmcia drivers 



This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 228aef63

drivers/pcmcia/i82365.c

+3 −2
Original line number Diff line number Diff line
@@ -1084,9 +1084,10 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem) 
    u_short base, i;

    u_char map;

    

    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#lx-%#lx, "

    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, "

	  "%#x)\n", sock, mem->map, mem->flags, mem->speed,

	  mem->res->start, mem->res->end, mem->card_start);

	  (unsigned long long)mem->res->start,

	  (unsigned long long)mem->res->end, mem->card_start);



    map = mem->map;

    if ((map > 4) || (mem->card_start > 0x3ffffff) ||

drivers/pcmcia/pd6729.c

+2 −1
Original line number Diff line number Diff line
@@ -642,7 +642,8 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, 
		goto err_out_free_mem;



	printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge "

		"at 0x%lx on irq %d\n",	pci_resource_start(dev, 0), dev->irq);

		"at 0x%llx on irq %d\n",

		(unsigned long long)pci_resource_start(dev, 0), dev->irq);

 	/*

	 * Since we have no memory BARs some firmware may not

	 * have had PCI_COMMAND_MEMORY enabled, yet the device needs it.

drivers/pcmcia/rsrc_nonstatic.c

+8 −4
Original line number Diff line number Diff line
@@ -808,8 +808,10 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) 
		if (res->flags & IORESOURCE_IO) {

			if (res == &ioport_resource)

				continue;

			printk(KERN_INFO "pcmcia: parent PCI bridge I/O window: 0x%lx - 0x%lx\n",

			       res->start, res->end);

			printk(KERN_INFO "pcmcia: parent PCI bridge I/O "

				"window: 0x%llx - 0x%llx\n",

				(unsigned long long)res->start,

				(unsigned long long)res->end);

			if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))

				done |= IORESOURCE_IO;
@@ -818,8 +820,10 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) 
		if (res->flags & IORESOURCE_MEM) {

			if (res == &iomem_resource)

				continue;

			printk(KERN_INFO "pcmcia: parent PCI bridge Memory window: 0x%lx - 0x%lx\n",

			       res->start, res->end);

			printk(KERN_INFO "pcmcia: parent PCI bridge Memory "

				"window: 0x%llx - 0x%llx\n",

				(unsigned long long)res->start,

				(unsigned long long)res->end);

			if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))

				done |= IORESOURCE_MEM;

		}

drivers/pcmcia/tcic.c

+3 −2
Original line number Diff line number Diff line
@@ -756,8 +756,9 @@ static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m 
    u_long base, len, mmap;



    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "

	  "%#lx-%#lx, %#x)\n", psock, mem->map, mem->flags,

	  mem->speed, mem->res->start, mem->res->end, mem->card_start);

	  "%#llx-%#llx, %#x)\n", psock, mem->map, mem->flags,

	  mem->speed, (unsigned long long)mem->res->start,

	  (unsigned long long)mem->res->end, mem->card_start);

    if ((mem->map > 3) || (mem->card_start > 0x3ffffff) ||

	(mem->res->start > 0xffffff) || (mem->res->end > 0xffffff) ||

	(mem->res->start > mem->res->end) || (mem->speed > 1000))