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

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

[PATCH] 64bit resource: fix up printks for resources in misc 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 685143ac

drivers/amba/bus.c

+3 −2
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL) 
amba_attr(id, "%08x\n", dev->periphid);

amba_attr(irq0, "%u\n", dev->irq[0]);

amba_attr(irq1, "%u\n", dev->irq[1]);

amba_attr(resource, "\t%08lx\t%08lx\t%08lx\n",

	  dev->res.start, dev->res.end, dev->res.flags);

amba_attr(resource, "\t%016llx\t%016llx\t%016lx\n",

	 (unsigned long long)dev->res.start, (unsigned long long)dev->res.end,

	 dev->res.flags);



/**

 *	amba_device_register - register an AMBA device

drivers/atm/ambassador.c

+2 −1
Original line number Diff line number Diff line
@@ -2257,7 +2257,8 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ 
	}



	PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"

		" IO %lx, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),

		" IO %llx, IRQ %u, MEM %p",

		(unsigned long long)pci_resource_start(pci_dev, 1),

		irq, bus_to_virt(pci_resource_start(pci_dev, 0)));



	// check IO region

drivers/atm/firestream.c

+3 −2
Original line number Diff line number Diff line
@@ -1657,9 +1657,10 @@ static int __devinit fs_init (struct fs_dev *dev) 
	func_enter ();

	pci_dev = dev->pci_dev;



	printk (KERN_INFO "found a FireStream %d card, base %08lx, irq%d.\n", 

	printk (KERN_INFO "found a FireStream %d card, base %16llx, irq%d.\n",

		IS_FS50(dev)?50:155,

		pci_resource_start(pci_dev, 0), dev->pci_dev->irq);

		(unsigned long long)pci_resource_start(pci_dev, 0),

		dev->pci_dev->irq);



	if (fs_debug & FS_DEBUG_INIT)

		my_hd ((unsigned char *) dev, sizeof (*dev));

drivers/block/sx8.c

+3 −2
Original line number Diff line number Diff line
@@ -1694,9 +1694,10 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	DPRINTK("waiting for probe_comp\n");

	wait_for_completion(&host->probe_comp);



	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",

	printk(KERN_INFO "%s: pci %s, ports %d, io %llx, irq %u, major %d\n",

	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,

	       pci_resource_start(pdev, 0), pdev->irq, host->major);

	       (unsigned long long)pci_resource_start(pdev, 0),

		   pdev->irq, host->major);



	carm_host_id++;

	pci_set_drvdata(pdev, host);

drivers/char/applicom.c

+6 −3
Original line number Diff line number Diff line
@@ -209,13 +209,16 @@ static int __init applicom_init(void) 
		RamIO = ioremap(dev->resource[0].start, LEN_RAM_IO);



		if (!RamIO) {

			printk(KERN_INFO "ac.o: Failed to ioremap PCI memory space at 0x%lx\n", dev->resource[0].start);

			printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "

				"space at 0x%llx\n",

				(unsigned long long)dev->resource[0].start);

			pci_disable_device(dev);

			return -EIO;

		}



		printk(KERN_INFO "Applicom %s found at mem 0x%lx, irq %d\n",

		       applicom_pci_devnames[dev->device-1], dev->resource[0].start, 

		printk(KERN_INFO "Applicom %s found at mem 0x%llx, irq %d\n",

		       applicom_pci_devnames[dev->device-1],

			   (unsigned long long)dev->resource[0].start,

		       dev->irq);



		boardno = ac_register_board(dev->resource[0].start, RamIO,0);